Merge pull request #9523 from kpfleming/builder-improvements

Package builder improvements

diff --cc builder-support/dockerfiles/Dockerfile.debbuild-prepare
Simple merge

diff --cc builder-support/dockerfiles/Dockerfile.rpmbuild
Simple merge

diff --cc builder-support/dockerfiles/Dockerfile.target.docs
Simple merge