HDFS-7109. TestDataStorage does not release file locks between tests. Contributed by Chris Nauroth.

(cherry picked from commit 0795fe3721cf86ed89d5e9058c977a1113247d08)