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

Conflicts:
	sdk/output-argeo-tp-rap.target

diff --cc sdk/output-argeo-tp-rap.target
index 552c8a4ef9b6365b924de6b2815258251f373304,e16e61cd209dbdf848873ef1663685f5bd5febec..938ed69131cea31aa7ce04571249a766bbfd4941
--- 1/sdk/output-argeo-tp-rap.target
--- 2/sdk/output-argeo-tp-rap.target
+++ b/sdk/output-argeo-tp-rap.target
@@@ -2,12 -2,15 +2,15 @@@
  <?pde version="3.8"?>
  <target name="(output) argeo-tp-rap">
        <locations>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.formats" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.poi" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp.gis" type="Directory"/>
 -              <location path="${project_loc:argeo-slc-unstable}/../output/a2/org.argeo.tp" type="Directory"/>
 +              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.apache" type="Directory"/>
 +              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.eclipse.equinox" type="Directory"/>
 +              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.eclipse.rap" type="Directory"/>
 +              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.jetty" type="Directory"/>
 +              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.sdk" type="Directory"/>
 +              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.jcr" type="Directory"/>
 +              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.poi" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp.gis" type="Directory"/>
++              <location path="${project_loc:argeo-slc}/../output/a2/org.argeo.tp" type="Directory"/>
        </locations>
  </target>