Correctly serializing items with names different from Java bean names (e.g. clazz vs. class).
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseResource.java