cqi pushed to rpkg (el6). "Backport container-build fix"