CMS-2066 Update SchemaResourceTest to use json assertion

SchemaResource test is converted to use json assertion
Merge branch 'master' of github.com:enonic/wem-ce into CMS-2066

Conflicts:
	modules/wem-web/src/test/java/com/enonic/wem/admin/rest/resource/schema/SchemaResourceTest.java
CMS-2066 Update SchemaResourceTest to use json assertion

Fix broken tests after resolving conflicts
Merge branch 'master' of github.com:enonic/wem-ce into CMS-2066
Merge pull request #365 from enonic/CMS-2066

CMS-2066 Update SchemaResourceTest to use json assertion