Revert "Switch to maven installed from Arch."

This reverts commit 6ce3ac45a79480249929c869fdf6c9a8b96d9b94.
Don't include maven version in path.
Merge remote-tracking branch 'origin/master'