Merge "Fix DCAE deploy/undeploy"