svn merge -c 1437775 FIXES: YARN-354. WebAppProxyServer exits immediately after startup. Contributed by Liang Xie


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1437777 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-0.23' of github.com:griddynamics/yhadoop-common into branch-0.23-gd
Merge branch 'branch-0.23-gd' of github.com:griddynamics/yhadoop-common into fb-YAHOO-159-branch-0.23-gd