HADOOP-10563. Remove the dependency of jsp in trunk. Contributed by Haohui Mai.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1592069 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-10568. Add s3 server-side encryption. Contributed by David S. Wang.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1592133 13f79535-47bb-0310-9956-ffa450edef68