AMBARI-25423 Backport AMBARI-23256 to branch-2.6
What changes were proposed in this pull request?
Need to backport AMBARI-23256 fix in 2.6.2 release
How was this patch tested?
manual tests
Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-Github-PullRequest-Builder/5585/ Test FAILed. Test FAILured.
retest this please
Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-Github-PullRequest-Builder/5586/ Test FAILed. Test FAILured.
retest this please
Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-Github-PullRequest-Builder/5594/ Test FAILed. Test FAILured.
retest this please
retest this please