Fixing merge issue in CloudControllerServiceImpl.deployCartridgeDefinition() method