Cleanup generate-deployment-manifest to remove extra merge
Cleanup generate-deployment-manifest to remove extra merge

[finishes #117465199]

Signed-off-by: Jen Spinney <475b118f8db4f150e7ed3b69b35fd7c857f9c9f8@hpe.com>

cloudfoundry-incubator/diego-release,cloudfoundry-incubator/diego-release,cloudfoundry-incubator/diego-release,cloudfoundry-incubator/diego-release