Merge branch 'trunk' into HDFS-5413
HDFS-5413: add missing sub-commands for journalnode and haadmin
Merge branch 'HDFS-5413' into HDFS-5413_YARN-1349