Merge branch 'master' into CMS-3570

Conflicts:
	modules/wem-portal/src/test/resources/com/enonic/wem/portal/postprocess/injection/liveEditInjectionBodyEnd.html