Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Maven: use same version number for plugin version and API version
  Maven: Add missing junit dependency
  Consume API version 2.10
  Consume API version 2.9

Conflicts:
	lib/gerrit/BUCK
	pom.xml

Change-Id: If133617f4e8a46821790d0e6ce3d2c576979654e