Merge remote-tracking branch 'origin/bugfix/7561_Conv2EnergyInterface'
Remove hard-coded numbers from CreateGroupingWorkspaceTest.

It now just checks against the number of detectors in the instrument.
Refs #7605
Merge branch 'bugfix/7605_CreateGroupingWorkspaceTest_fix' into develop