AMBARI-6933. Rolling restart not working. Additional fix.