fixing objectDeltaType
Merge branch 'parser' of github.com:Evolveum/midpoint into parser

Conflicts:
	infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
	infra/schema/src/main/java/com/evolveum/midpoint/schema/DeltaConvertor.java
	infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
fixing model-impl tests..