Merge pull request #9152 from duglin/DockerBuildEnvs

Allow a few more DOCKER_* env vars to pass thru Makefile