Merge pull request #4322 from wmtan/RemoveLineBreaks

Remove line breaks. They cause problems
Merge remote branch 'origin/CMSSW_7_2_X' into CMSSW_7_0_X