Maven updates

More maven updates ready for master. This should be the last of them until 6.2 GA1 and SP1 are on Central Repository. Thanks.

@codyhoag