Adding param openam_master, tidying up the manifests