Merge branch 'master' into osgi

Conflicts:
	modules/wem-admin/src/test/resources/com/enonic/wem/admin/rest/resource/module/get_module_by_key_success.json