Fixed some merge issue.  Refs #8405.
Merge branch 'feature/8405_filterevent_groupeddet' into develop.  Refs #8405.

Merge branch 'feature/8405_filterevent_groupeddet' into develop.

Conflicts:
	Code/Mantid/Framework/Algorithms/src/FilterEvents.cpp