Bring schemaPlugins up to date
Exclude schemaPlugins for later revs
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x

Conflicts:
	schemaPlugins