GIRAPH-659: giraph-hive tests all fail (majakabiljo)
Merge remote-tracking branch 'origin/trunk' into g2

Conflicts:
	CHANGELOG
GIRAPH-663: Fix HiveIO metastore host setting
Merge remote-tracking branch 'origin/trunk' into g2