GIRAPH-650: Exception in GiraphConfiguration initialization (majakabiljo)
GIRAPH-653: Hadoop_non_secure broken (majakabiljo)
GIRAPH-639: Add support for multiple Vertex/Edge inputs (majakabiljo)
GIRAPH-651: giraph-hive tests
Merge remote-tracking branch 'origin/trunk' into edge-resolver