Initial work to get photospline integrated into the release.
Merge remote-tracking branch 'origin/IB/CMSSW_7_0_X/stable' into IB/CMSSW_7_0_X/root6