catch up to changes with recent WMCore versions
Merge pull request #4047 from hufnagel/spec-updates

catch up to changes with recent WMCore versions