HDFS-7153. Add storagePolicy to NN edit log during file creation. (Arpit Agarwal)
Merge branch 'trunk' into HDFS-6581

Conflicts:
	hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirectory.java
	hadoop-hdfs-project/hadoop-hdfs/src/test/resources/editsStored.xml
HDFS-7171. Fix Jenkins failures in HDFS-6581 branch. (Arpit Agarwal)