prepare for next development iteration
Merge branch 'es-1.2' into process-full-bulk-request-in-script

Conflicts:
	pom.xml