Merge branch 'master' into SPARK-4048

Conflicts:
	bin/compute-classpath.cmd
	pom.xml
	sql/hive/pom.xml