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

Conflicts:
	Code/Mantid/Framework/DataHandling/src/SaveNXSPE.cpp
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
Update the function signatures of the Python instrument export.

Refs #9133
Remove SampleActor from InstrumentActor. re #9133

As discussed with Roman if ever relevant can be added again
Merge branch 'master' of github.com:mantidproject/mantid into feature/9133_idf_source_shape
Merge remote-tracking branch 'origin/feature/9133_idf_source_shape' into feature/9133_idf_source_shape
Remove unused variable. re #9133
Merge remote-tracking branch 'origin/feature/9133_idf_source_shape'