Fixes to prevent renumbering of image sets if no grouping
Merge branch 'multiprocessing' of github.com:CellProfiler/CellProfiler into multiprocessing