Merge in OPAPM/coco_terraform_config from OPMAAS-3217 to master * commit '66ef2b1a11b0be4ddf99ec3605d2a67c3ee5875e': OPMAAS-3217 - Adjusted Service Name.