Several bug fixes in the last miniute

1. Align the definition of rho with CMSSW
2. Turn on the Puppi JEC, which was off