master
Fix lint issues reported by staticcheck
b2: fix versions and .files with no extension - fixes #5244