Merge branch 'stable-2.7'

* stable-2.7:
  Fix javadoc generation for gerrit extension and plugin API

Conflicts:
	gerrit-extension-api/pom.xml
	gerrit-plugin-api/pom.xml

Change-Id: Ic43483a8328b807e265b237a5cbb931cc50d0439