HDFS-4651: correct usage string
HDFS-4651: remove System.out calls
HDFS-4651: port tests except for TestOfflineImageViewer, which will need some manual resolution