OP-764: Get tests working
Merge branch 'feature/ozp-421-convert-owf8-groovy-to-java' of https://github.com/ozoneplatform/ozp-commons into feature/ozp-421-convert-owf8-groovy-to-java

Conflicts:
	bundles/server/domain/src/main/java/org/ozoneplatform/commons/server/domain/model/WidgetDefinition.java