castor enabled
Merge pull request #4380 from civanch/castor_enabled

Castor enabled.
Merge remote branch 'origin/CMSSW_7_2_X' into CMSSW_7_0_X