Merged CMSSW_7_1_X from repository cms-sw
Merged refs/pull/3333/head from repository cms-sw
add maxCand to TrajectorySegmentBuilder constructer