Only store the cff the first time
Merge branch 'store-dataset-53X' of github.com:hroskes/cmssw into track-splitting-53X