CMS-4181 Use OSGi blueprint in wem-admin.
Merge branch 'master' into blueprint

Conflicts:
	modules/wem-admin/src/main/java/com/enonic/wem/admin/AdminModule.java
	modules/wem-admin/src/main/java/com/enonic/wem/admin/rest/RestServlet.java
	modules/wem-admin/src/main/java/com/enonic/wem/admin/rest/resource/schema/SchemaIconResource.java
	modules/wem-admin/src/main/java/com/enonic/wem/admin/rest/resource/schema/content/ContentTypeResource.java
	modules/wem-admin/src/main/java/com/enonic/wem/admin/rest/resource/schema/mixin/MixinResource.java
	modules/wem-admin/src/main/java/com/enonic/wem/admin/rest/resource/schema/relationship/RelationshipTypeResource.java
Merge branch 'master' into blueprint

Conflicts:
	modules/wem-admin/src/main/java/com/enonic/wem/admin/AdminModule.java
	modules/wem-admin/src/main/java/com/enonic/wem/admin/rest/RestServlet.java
	modules/wem-admin/src/main/java/com/enonic/wem/admin/rest/resource/schema/SchemaIconResource.java
	modules/wem-admin/src/main/java/com/enonic/wem/admin/rest/resource/schema/content/ContentTypeResource.java
	modules/wem-admin/src/main/java/com/enonic/wem/admin/rest/resource/schema/mixin/MixinResource.java
	modules/wem-admin/src/main/java/com/enonic/wem/admin/rest/resource/schema/relationship/RelationshipTypeResource.java
CMS-4181 Use OSGi blueprint in wem-admin. Fixed some small mistakes.