Add missing @Deprecated annotations, reorder fields due to checkstyle warnings.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@1439942 13f79535-47bb-0310-9956-ffa450edef68