Merge branch 'develop' of git://github.com/jtriley/StarCluster into BLUK-76_ignore_placement_grp
BLUK-76 refixed after a trunk merged broke it
Merge branch 'BLUK-76_ignore_placement_grp' into datacratic_dev