HAMA-871: NPE when building core module due to gmaven-plugin

git-svn-id: https://svn.apache.org/repos/asf/hama/trunk@1568909 13f79535-47bb-0310-9956-ffa450edef68
fix duplicate declaration of commons-cli

git-svn-id: https://svn.apache.org/repos/asf/hama/trunk@1568928 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'trunk' of git://git.apache.org/hama into trunk

Conflicts:
	core/pom.xml