Merge "Updated to use vnfOperationalEnvironmentId"