Merged refs/pull/2808/head from repository cms-sw
Fix InputTags of PF RecHit modules