Merge "Upgrade maven dependencies"