AMBARI-4570. Various issues related to decommission support