Add back the dist-upgrade and pull the apt-proxy config forward from roles/common