Forward port of remaining CMSSW_7_2_X bits into CMSSW_7_3_X.

taudaughters.size() is never < 0...