Modified file loader (for Bilby instrument data) to avoid compiler errors/warnings
Resolve merge conflict. re #10091

Merge branch 'master' of github.com:david-mannicke/mantid into feature/10091_new_bilby_format

Conflicts:
	Code/Mantid/Framework/DataHandling/src/LoadBBY.cpp