As Jitendra noticed in reviewing HDFS-1073, this test case was accidentally left disabled in the branch. Re-enabling it and modifying it to work with the new code exposed that HDFS-1952 hadn't been merged fully into the branch. This JIRA is to re-enable that test and fix the bug.