AMBARI-7950. NPE after upgrade to 1.6.0 to 1.7.0.(vbrodetskyi)