ACCUMULO-2852: use Cwd, since we're using Cwd. also change usage text to match new executable name

Signed-off-by: Josh Elser <elserj@apache.org>
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'