ACCUMULO-2252 Backport ACCUMULO-684 to 1.4.x

A one-line manual backport of the one-line fix in ACCUMULO-684. The ZooUtil class
modified here is the one residing under the fate component in later releases.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'