Allow automatic forward porting

This does the final merge between IB/CMSSW_6_2_X/stable and IB/CMSSW_6_2_X/devel-gcc472. Changes between the two branches are maintained, however from now on we can turn on the automatic update, which should do the correct thing.