AMBARI-5707. Fastdiff bug and other fixes.