AMBARI-8735. Preparing to deploy issue for 1.3 stack.  (onechiporenko)
Merge remote-tracking branch 'origin/trunk' into trunk