Store sample component not as IObjComponent but IComponent. re #9133
Merge branch 'master'. re #9133

Conflicts:
	Code/Mantid/Framework/DataHandling/src/SaveNXSPE.cpp
Merge remote-tracking branch 'origin/feature/9136_extend_locations_tag'
Merge branch 'master' of github.com:mantidproject/mantid into feature/9133_idf_source_shape
Make IDF parser submit assembly sample comp also. re #9133

And add unit test to test that this works
store store as IComponent. re #9133

and added unit test to test ok
Merge branch 'feature/9133_idf_source_shape' into develop