AMBARI-7120. Current trunk won't build. (yusaku)