AMBARI-4078. Remove few issues caused by 3-way merges on Fri 13 (dlysnichenko)
AMBARI-4079. YARN on HDP2. Using resource management lib (Arsen Babych
via aonishuk)