HDFS-4013. TestHftpURLTimeouts throws NPE. Contributed by Chao Shi.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455755 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9399. protoc maven plugin doesn't work on mvn 3.0.2. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1455771 13f79535-47bb-0310-9956-ffa450edef68
Merge remote branch 'origin/trunk' into trunk-gd
Merge remote branch 'origin/trunk-gd' into fb-YAHOO-271-trunk-gd