svn merge -c 1373253 from trunk for HDFS-3802. StartupOption.name in HdfsServerConstants should be final.