AMBARI-8474. Tests fail on trunk (aonishuk)