AMBARI-8335. Unit Test Failures caused by windows code merge in trunk. (Jayush Luniya via yusaku)