AMBARI-8269. Merge branch-windows-dev changes to trunk. (Jayush Luniya via yusaku)