merge -c r1458065 from trunk to branch-2 for YARN-481. Add AM Host and RPC Port to ApplicationCLI Status Output (Chris Riccomini via bikas)