Merge "[DCAE] Update dcaegen2 cloudify manager image"