[CMSSW_7_0_X] Cleanup and bugfix for Coral on Darwin