Merge master into feature/1.3.0

Conflicts:
	base/unifiedviews-dpu-base/pom.xml
	libs/dataunit-rdf-simple/pom.xml