HDFS command fails with exception following merge of HADOOP-8325

We are seeing most hdfs commands in our nightly acceptance tests fail with an exception as shown below. This started with a few hours of the merge of HADOOP-8325 on 4/30/2012

hdfs --config conf/hadoop/ dfs -ls dirname
ls: `dirname': No such file or directory
12/05/01 16:57:52 WARN util.ShutdownHookManager: ShutdownHook 'ClientFinalizer' failed, java.lang.IllegalStateException: Shutdown in progress, cannot remove a shutdownHook
java.lang.IllegalStateException: Shutdown in progress, cannot remove a shutdownHook
at org.apache.hadoop.util.ShutdownHookManager.removeShutdownHook(ShutdownHookManager.java:166)
at org.apache.hadoop.fs.FileSystem$Cache.remove(FileSystem.java:2202)
at org.apache.hadoop.fs.FileSystem$Cache.closeAll(FileSystem.java:2231)
at org.apache.hadoop.fs.FileSystem$Cache$ClientFinalizer.run(FileSystem.java:2251)
at org.apache.hadoop.util.ShutdownHookManager$1.run(ShutdownHookManager.java:54)