Merge pull request #1041 from jmaas/master

Align spec with EL7, remove legacy cruft.