HBASE-9185 mvn site target fails when building with Maven 3.1

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1512816 13f79535-47bb-0310-9956-ffa450edef68
HBASE-9155 Enhance LoadTestTool to support updates

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1512817 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-HBASE-8559-trunk-gd