- Merge branch 'master' of github.com:dmwm/WMCore
  - Merge pull request #4054 from hufnagel/build-fail
  - fix build problems due to global cherrypy in setup_test