KNOX-88: Support HDFS HA
Merge remote-tracking branch 'origin/apache-ref/master' into champlain