YARN-1673. Fix option parsing in YARN's application CLI after it is broken by YARN-967. Contributed by Mayank Bansal. svn merge --ignore-ancestry -c 1564188 ../../trunk/