HADOOP-7419. new hadoop-config.sh doesn't manage classpath for HADOOP_CONF_DIR correctly. Contributed by Bing Zheng and Todd Lipcon.