KNOX-307: Topology deployment failed after undeploy
Merge remote branch 'origin/apache-ref/v0.4.0' into baikal-GA-0.4.0