Merge remote-tracking branch 'origin/release/1.37.0' into release/1.35.1

Change-Id: I6bf440ee0e00dd266e46b0f81b6922dd89b54875

diff --cc org.simantics.district.route.ontology/META-INF/MANIFEST.MF
index 0000000000000000000000000000000000000000,c9623fa06f76617b26a66ecdfc0b3457d0ced3a7..ee4c1e64ad52d578c67a8d0db8fad0d06b26c35f
mode 000000,100644..100644
--- /dev/null
--- 2/org.simantics.district.route.ontology/META-INF/MANIFEST.MF
+++ b/org.simantics.district.route.ontology/META-INF/MANIFEST.MF
@@@ -1,0 -1,11 +1,12 @@@
 - org.simantics.district.network.ontology;bundle-version="1.0.0"
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: http://www.simantics.org/DistrictNetworkRoutes
+ Bundle-SymbolicName: org.simantics.district.route.ontology
+ Bundle-Version: 1.0.0.qualifier
+ Bundle-Vendor: Semantum Oy
+ Require-Bundle: org.simantics.layer0,
++ org.simantics.district.network.ontology;bundle-version="1.0.0",
++ org.simantics.diagram.ontology;bundle-version="2.2.0"
+ Automatic-Module-Name: fi.vtt.apros.district.route.ontology
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ Export-Package: org.simantics.district.route.ontology

diff --cc pom.xml
Simple merge