Handle updated WMCore.
Merge pull request #4508 from matz-e/current_wmcore

Handle updated WMCore.