Merge remote-tracking branch 'blessed/master' into 12I_CPO_TP_S4_Ugo
Merge remote-tracking branch 'blessed/master' into 12I_CPO_TP_S4_Ugo
Adding schema parameter to pgRouting connection, refactoring of interfaces methods, adding first attempts to handle SRSs
Merge branch 'master' into 12I_CPO_TP_S4_Ugo

Conflicts:
	src/community/pom.xml
	src/extension/h2/src/main/java/GeoServerApplication_de.properties
	src/security/ldap/src/main/resources/GeoServerApplication_de.properties
	src/web/app/pom.xml
	src/web/core/src/main/resources/GeoServerApplication_de.properties
	src/web/security/src/main/resources/GeoServerApplication_de.properties
	src/web/wms/src/main/resources/GeoServerApplication_de.properties
Correcting pom.xml
Merge remote-tracking branch 'origin/12I_CPO_TP_S4_Ugo' into 12I_CPO_TP_S4_Ugo

Conflicts:
	src/community/pom.xml
	src/web/app/pom.xml
Merge remote-tracking branch 'upstream/12I_CPO_TP' into 12I_CPO_TP_S4_Ugo
Merge branch '12I_CPO_TP_S4_Ugo' into 12I_CPO_TP