HADOOP-10040. Correct native.vcxproj for inclusion of lz4hc.c. Contributed by Chris Nauroth.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1532136 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5352. Server#initLog() doesn't close InputStream in httpfs. Contributed by Ted Yu.

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