Merge remote-tracking branch 'origin/unstable' into testing

diff --cc sdk/output-argeo-tp-backend.target
index ccb11ac0afd4a9f1d83169c2cc1762c9ff3e42de,68982e58465e7448c0ac456d4a83b2297c3dad35..b78875ab1e56229a1910ea64142ea1553e603bf7
--- 1/sdk/output-argeo-tp-backend.target
--- 2/sdk/output-argeo-tp-backend.target
+++ b/sdk/output-argeo-tp-backend.target
@@@ -2,12 -2,12 +2,12 @@@
  <?pde version="3.8"?>
  <target name="argeo-tp-backend">
        <locations>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
 -              <location path="${project_loc:argeo-tp-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 -              <location type="Target" uri="file:${project_loc:argeo-tp-unstable}/sdk/output-argeo-tp-minimal.target"/>
 +              <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 +              <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.formats" type="Directory"/>
 +              <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.poi" type="Directory"/>
 +              <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.gis" type="Directory"/>
 +              <location path="${project_loc:argeo-tp}/../output/a2/osgi/equinox/org.argeo.tp.eclipse" type="Directory"/>
-               <location path="${project_loc}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
++              <location path="${project_loc:argeo-tp}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 +              <location type="Target" uri="file:${project_loc:argeo-tp}/sdk/output-argeo-tp-minimal.target"/>
        </locations>
  </target>