XD-540 work in progress
XD-540 added undeploy channel for local
modified test for undeploy