Add patch from CFEngine SVN. Fixes #1998
Update packaging for change from /var/rudder/policy-templates to /var/rudder/configuration-repository/policy-templates. Fixes #2013
Merge branch 'branches/rudder/2.3'

* branches/rudder/2.3:
  Don't create deprecated /var/rudder/policy-templates directory. Fixes #2031
  Refs #1984: The git clones GitHub URLs are fixed
  Update packaging for change from /var/rudder/policy-templates to /var/rudder/configuration-repository/policy-templates: change config file paths. Really fixes #2013
  Update packaging for change from /var/rudder/policy-templates to /var/rudder/configuration-repository/policy-templates. Fixes #2013 (cherry picked from commit 39a961dc87a7ffb58cb3e995859c4096c114dba4)
  Add patch from CFEngine SVN. Fixes #1998 (cherry picked from commit 4e545796317da8c3977a251ec530d74e716b3fbb)
  Refs #1964 default branch value removed
  Fixes #1963 reportsBootstrap.sql occurrence deleted
  Refs #1962 permit override
  Refs #1962 Get Rudder 2.3 sources

Conflicts:
	rudder-webapp/SPECS/rudder-webapp.spec
	rudder-webapp/debian/postinst
Add README file compatible with GitHub. Fixes #2038
Fixes #2047 References to branches added
Merge branch 'branches/rudder/2.3'

* branches/rudder/2.3:
  Fixes #2080: The rudder-server-root now also puts a logrotate config on RPM based hosts
  Fixes #2079: The RPM postinst script now commits correctly the existing PT library before attempting an update
  Fixes #2072 BuildArch: noarch to architecture independent packages added
  Fixes #2065 github URL switched from https:// (rw) to git:// (ro)
  Refs #2016 #2044 switch %config to %config(noreplace)
  Fixes #2044 files set as config files in rudder-server-root and rudder-inventory-ldap
  Fixes #2043 We are using our mirror links for cfengine and jetty now
  Fixes #2016 rudder-web.properties and rudder-users.xml has been set as config files
  Fixes #2039: The debian postinst script now commits correctly the existing PT library before attempting an update
Merge branch 'branches/rudder/2.3'

* branches/rudder/2.3:
  Fixes #2043 Maven and OpenLDAP links added
  Refs #2080: The rudder-server-root now also puts a logrotate config on RPM based hosts - fixes
Reinclude original URLs as comments to trace origin of files, and so we know where to get new versions from. Refs #2043
Merge branch 'branches/rudder/2.3'

* branches/rudder/2.3:
  Refs 2112 Comments and placeholder file in shared-files/ added
  Refs #2112 typo
  Fixes #2112 Check shared-files folder independently from policy templates migration
  Fixes #2112 add shared-files folder attribute to rudder-web.properties and made DEB and RPM packaging to create this folder in case of update from 2.3.0
  Fixes #2111 Changed 'rudderPolicyVariables' attribute to 'policyInstanceVariable' in rudder-init.sh
Refs #1993 Change rudder sources download from github to rudder tarball (rudder-agent, rudder-inventory-endpoint, rudder-webapp)
Revert "Refs #1993 Change rudder sources download from github to rudder tarball (rudder-agent, rudder-inventory-endpoint, rudder-webapp)"

This reverts commit 1cd1e3f81d8c91a3d242b9ca978d82edd4b4c629.
Refs #1993 Add rudder sources download from rudder-project.org tarballs (rudder-agent, rudder-inventory-endpoint, rudder-inventory-ldap, rudder-policy-templates, rudder-reports, rudder-webapp, rudder-server-root)
Fix typo. Refs #1993
Trivial: s/Cfengine/CFEngine/g
Merge branch 'master' of github.com:Normation/rudder-packages
Trivial: s/Cfengine/CFEngine/g
Merge branch 'branches/rudder/2.3'

* branches/rudder/2.3:
  Add CFEngine patch to fix timer_policy behaviour. Fixes #2185
Update packging migration script to take into account new properties for 2.4. Fixes #2186
Remove obsolete patches folders from Debian packages that now use patches from the SOURCES/Makefile. Fixes #2149
Add an upgrade script for rudder-webapp to avoid problems introduced by fix for #2186. Fixes #1497. Refs #2186