Latest OpenSCAP changes to speed up SSG builds