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

Conflicts:
	org.simantics.district.network/src/org/simantics/district/network/profile/DistrictNodeGroup.java

Change-Id: I2780355701d80fc5dc992442209f614136e3c9db

diff --cc pom.xml
index 8376b38f5f2759e73f5e731d57b778d2a7b022f7,7834a65a0f048f86f7e4303fe5882d723ba573a7..720e49f4011fd83e48041701c6728f7f52b1d13c
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -8,7 -8,7 +8,7 @@@
  
        <!-- common settings for all modules -->
        <properties>
-               <branch-spec>release/1.35.0</branch-spec>
 -              <branch-spec>master</branch-spec>
++              <branch-spec>release/1.35.1</branch-spec>
                <simantics-download-site>http://www.simantics.org/download</simantics-download-site>
                <tycho-version>1.0.0</tycho-version>
        </properties>