update to idf schema address. re #9907
Merge branch 'master' of github.com:mantidproject/mantid into feature/9907_update_idf_schema
Merge branch into feature/9907_update_idf_schema. re #9907

Conflicts:
	Code/Mantid/instrument/IN4_Definition.xml
	Code/Mantid/instrument/IN6_Definition.xml
Hopefully remaining IDFs that need updating. re #9907
Merge branch 'master' of github.com:mantidproject/mantid into feature/9907_update_idf_schema
Merge remote-tracking branch 'origin/feature/9907_update_idf_schema'