Update schemaPlugins
Increase mem size for windows start bat
Update schemaPlugins
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x

Conflicts:
	schemaPlugins