NOREF: Further corrections to the layout of the deployment and webserver profile manifests