Back out bad fix
Properly update empty process history ID
Merge pull request #2569 from wmtan/ProperlyUpdateEmptyProcessHistoryID

Framework fixes -- Properly update empty process history
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X