Merge remote-tracking branch 'origin/master' into v2.x

diff --cc dep/org.argeo.suite.dep.e4.rcp/pom.xml
index 57e5b2b77dc9037a7867cce2b80c9ab7e0a4b1cd,f52536231419fad80da93381703134cf37bf644f..119d7a015a35cac6a0f7866101dbb865098e5931
--- 1/dep/org.argeo.suite.dep.e4.rcp/pom.xml
--- 2/dep/org.argeo.suite.dep.e4.rcp/pom.xml
+++ b/dep/org.argeo.suite.dep.e4.rcp/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>dep</artifactId>
-               <version>2.1.16-SNAPSHOT</version>
 -              <version>2.3.2-SNAPSHOT</version>
++              <version>2.1.23-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.suite.dep.e4.rcp</artifactId>

diff --cc dep/pom.xml
Simple merge

diff --cc pom.xml
index a772f14f43ad17c920d79be78c474a0f9a6a0db3,2290b0b2a8576eed7c217f06d1b157e859ba5ce5..7c1ba6d78a1944797e504e963ca0c056e2777c75
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -15,10 -17,11 +17,11 @@@
                <!-- Dependencies -->
                <version.argeo-tp>2.1.27</version.argeo-tp>
                <version.argeo-tp-extras>2.1.13</version.argeo-tp-extras>
 -              <version.argeo-commons>2.1.104-SNAPSHOT</version.argeo-commons>
 +              <version.argeo-commons>2.1.103</version.argeo-commons>
+               <!-- <version.argeo-rcp>2.1.104-SNAPSHOT</version.argeo-rcp> -->
                <version.argeo-suite-icons>2.1.1</version.argeo-suite-icons>
  
 -              <argeo.rpm.stagingRepository>/srv/rpmfactory/unstable/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
 +              <argeo.rpm.stagingRepository>/srv/rpmfactory/testing/argeo-osgi-2/argeo</argeo.rpm.stagingRepository>
                <git.rw />
        </properties>
        <modules>