Merge remote-tracking branch 'origin/master' into 3.4.x
Fix parent pom version and connector-test dependency