Merge remote-tracking branch 'upstream/master' into CSPACE-5498

Conflicts:
	3rdparty/nuxeo/nuxeo-platform-listener/build.xml
	3rdparty/nuxeo/nuxeo-platform-listener/pom.xml

diff --cc 3rdparty/nuxeo/nuxeo-platform-listener/build.xml
index 0e0014a7febeed0d88178022a60ece7e28577b44,10dc369ba160b67d98402c267838bd3c4506966e..985b9dc67d196d455bc8dc1f459f05a0b93f115d
--- 1/3rdparty/nuxeo/nuxeo-platform-listener/build.xml
--- 2/3rdparty/nuxeo/nuxeo-platform-listener/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/build.xml
@@@ -115,17 -115,17 +115,20 @@@
  
      <target name="deploy" depends="package"
              description="deploy nuxeo server libs to ${jee.server.cspace}">
+         <ant antfile="updateobjectlocationonmove/build.xml" target="deploy" inheritall="false"/>
 +        <ant antfile="updaterelationsondelete/build.xml" target="deploy" inheritall="false"/>
      </target>
  
      <target name="undeploy"
              description="undeploy nuxeo server libs from ${jee.server.cspace}">
+         <ant antfile="updateobjectlocationonmove/build.xml" target="undeploy" inheritall="false"/>
 +        <ant antfile="updaterelationsondelete/build.xml" target="undeploy" inheritall="false"/>
      </target>
  
      <target name="dist"
              description="generate distribution for nuxeo server libs" depends="package">
+         <ant antfile="updateobjectlocationonmove/build.xml" target="dist" inheritall="false"/>
 +        <ant antfile="updaterelationsondelete/build.xml" target="dist" inheritall="false"/>
      </target>
  
  </project>

diff --cc 3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
index 7548a2a719c0d4f60622ee615e2044217c1f7b64,a19a3425f8e7d4a4e1978c299815650f50893c90..2a2cbc27f5337dce6c7ead0d53619b7f68c94227
--- 1/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
--- 2/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-listener/pom.xml
@@@ -13,7 -14,7 +13,8 @@@
      <name>services.3rdparty.nuxeo.listener</name>
  
      <modules>
+         <module>updateobjectlocationonmove</module>
 +        <module>updaterelationsondelete</module>
      </modules>
  
      <dependencies>