AMBARI-6422. Failing ambari-server tests on trunk (dlysnichenko)