AMBARI-6508. BE MM fixes (dlysnichenko)