Merge branch 'master' into osgi

Conflicts:
	modules/wem-boot/src/main/java/com/enonic/wem/boot/WebInitializer.java