Branching from trunk for HADOOP-10150 and HDFS-6134 at 1594374

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