Merge pull request #5121 from jtattermusch/refactor_dockerfiles

Refactor dockerfiles