FlatPU

Also pull request for CMSSW_7_0_X branch