Merge r1505362 from trunk. HDFS-4602. TestBookKeeperHACheckpoints fails. Contributed by Uma Maheswara Rao G.