Merge "Upgrade Maven plugins"