Merge branch 'stable-2.11' * stable-2.11: Maven: use same version number for plugin version and API version Maven: Add missing junit dependency Conflicts: lib/gerrit/BUCK pom.xml Change-Id: I203ddb3be86d3de64c79e3f3ce4df1bedcf03a07