Mainly to integrate [41581](http://www.github.com/cms-sw/cmssw/pull/41581). The IBs seem to still have some spurious problems but this PR looks okay, we will finalize the release now.