CMS 7.0 > 7.1 merge and compile cleanup