Merge pull request #262 from pwendell/mvn-fix

Fix maven build issues in 2.10 branch

Found some issues when locally testing maven.