Rebase of pull request #2785

#2785 wants to change 439 files despite a rebase.  After merging with the head of CMSSW_6_2_X_SLHC these are the only files with changes however.

Note that I haven't tested anything yet - I'll do that through this pull request and comment here.  #2785 should be closed.

@sviret please check this request.  It should be everything you wanted without any changes to other packages.