Update schemaPlugins
Update schemaPlugins
Add validation messages to editor elements
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x

Conflicts:
	schemaPlugins