AMBARI-7520. Fix UI Unit tests. (onechiporenko)
Merge remote-tracking branch 'origin/trunk' into origin-trunk