Merge pull request #3191 from srdo/maven-upgrade

MINOR: Maven upgrade to 3.6.3