MAPREDUCE-6177. Minor typo in the EncryptedShuffle document about ssl-client.xml. Contributed by Yangping Wu. (harsh)

(cherry picked from commit 8963515b880b78068791f11abe4f5df332553be1)
HADOOP-10530 Make hadoop build on Java7+ only (stevel)