update from cms-sw/CMSSW_6_2_X_SLHC

gem-sw:CSC-Trigger-Upgrade-GEM-RPC-forSLHC12 does not compile without updates