Merge remote-tracking branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_1_X/devel
sync with 71X stable branch
resolve the conflict between stable and devel branch
Merge pull request #565 from smuzaffar/IB/CMSSW_7_1_X/devel

sync with 71x/stable