clean up, override statements back in
Merge branch 'pr_03' of github.com:CmsHI/cmssw into pr_03