Merge "jjb/releng: fix compass-container $DOCKERFILE"