Merge commit 'ffdf837'

Merge commit 'ffdf837'

Resolved conflicts from:
	bundles/org.simantics.db.procore/src/fi/vtt/simantics/procore/internal/GraphSessionVirtual.java
	bundles/org.simantics.db.server/src/org/simantics/db/server/internal/SessionI.java
	bundles/org.simantics.db/src/org/simantics/db/Database.java
	bundles/org.simantics.db/src/org/simantics/db/service/ClusterSetsSupport.java
	bundles/org.simantics.modeling/src/org/simantics/modeling/SCL.java
	bundles/org.simantics.workbench/src/org/simantics/workbench/internal/SimanticsWorkbenchAdvisor.java
	bundles/org.simantics/src/org/simantics/SimanticsPlatform.java