Resolve BMK-253 (fix by Chris Hollowell plus small additions)
Resolve BMK-253 (fix by Chris Hollowell plus small additions)
This replaces !266 (merged) . Apart from a few comments, the only difference is an additional yum clean all (which maybe is not necessary, but I keep it in for consistency with all other images we build).
Thanks to @chollowe !