MLHR-1591 #resolve
Merge pull request #389 from andyperlitch/pending_undeploy.MLHR-1591

MLHR-1591 #resolve