Merge remote-tracking branch 'origin/feature/6685_handle_versions'
Re #6614 IN4 IDF and param file
Re #6614 Flat detector
Re #6614 Cleaning up
Re #6614 New ILL facilities
Re #6614 Changes to accomodate new instruments
Re #6614 Updated IN4 definition
Merge branch 'feature/6617_ILL_IN6_2' into develop