HDFS-6872. Fix TestOptionsParser. (clamb)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618974 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6873. Constants in CommandWithDestination should be static. (clamb)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/fs-encryption@1618975 13f79535-47bb-0310-9956-ffa450edef68