GIRAPH-732
Merge remote-tracking branch 'upstream/trunk' into trunk

Conflicts:
	giraph-core/src/main/java/org/apache/giraph/utils/ConfigurationUtils.java