Maven upgrade

Supersedes #6350