partial rol back to old tau lifetime calculation to fix crashes
adding patch to correctly propogate decay length through decay
Merge pull request #4933 from inugent/7_1_X_lifetime_patch

7 1 x lifetime patch
Merge remote-tracking branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X