Merge pull request #17677 from fboudra/master

Remove yum cache to reduce image size