Merge r1553596 from trunk. Fixed yarn rmadmin command to print the correct usage info. Contributed by Akira AJISAKA.