Merge pull request #2487 from wmtan/AddMissingIOstreamInclude

Misc fixes -- Add missing include of iostream
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X