Merge HDFS-3469 (r1380003) from trunk (HDFS-3469. start-dfs.sh will start zkfc, but stop-dfs.sh will not stop zkfc similarly. Contributed by Vinay)