OBMFULL-6105 refactor contact indexing
(cherry picked from commit a2c22469ef5c2e6e9a7374eb61dd876605d79e2d)
 OBMFULL-6105 document are loaded synchronously for indexing
(cherry picked from commit b13418025285f8d2488ff606525f2cc9dbda2b16)
OBMFULL-6105 Give better names to solrdocument append methods.

Conflicts:
	java/sync/services/src/main/java/org/obm/sync/solr/jms/ContactUpdateCommand.java
(cherry picked from commit 26c3bd58c1d333e0b8ddf540a77a03be0f4ba298)
OBMFULL-6105 create a new resource-management-filter project

	This project provides a filter that inject a ResourceHolder
	with a @RequestScoped scope. It can be injected as needed
	by any resource producer to store its resources and
	these resources will be closed at the request end.

Conflicts:
	java/sync/pom.xml
	java/sync/services/pom.xml
(cherry picked from commit 3fed0b5d3218a1d69897f244713a0674dc7ab4d1)
OBMFULL-6105 use ResourceHolder to manage JDBC connections

Conflicts:
	java/sync/services/src/main/java/org/obm/sync/ObmSyncServletModule.java

Conflicts:
	java/sync/dbcp/src/main/java/org/obm/dbcp/DatabaseModule.java
	java/sync/services/src/main/java/org/obm/sync/GuiceServletContextListener.java
	java/sync/services/src/main/java/org/obm/sync/ObmSyncServletModule.java
(cherry picked from commit 78ac8acd9ad558165ff55cebcf85c3d98f227118)
OBMFULL-6110 Now doing local JDBC transactions

Conflicts:
	java/sync/services/src/main/java/org/obm/sync/GuiceServletContextListener.java

Conflicts:
	java/sync/services/src/main/java/org/obm/sync/GuiceServletContextListener.java
(cherry picked from commit 7c4f89dc612978318a00410fd21d1ae8277c2ea1)
OBMFULL-6114 Updated PostgreSQL driver version
(cherry picked from commit 5f49ecc53c60cbb3185ef549c2c5950f24ede34c)
OBMFULL-6114 Now using HikariCP as a connection pool in obm-sync

Conflicts:
	java/sync/dbcp/pom.xml
	java/sync/dbcp/src/test/java/org/obm/dbcp/H2DriverConfiguration.java
	java/sync/pom.xml
(cherry picked from commit 97a8fa90466f7dd06389d0a0f7262fed0bb57b24)
OBMFULL-6117 Refactored IniFile

Conflicts:
	java/sync/configuration/src/test/java/org/obm/configuration/DatabaseConfigurationImplTest.java
	java/sync/opush/push-dao/src/test/java/org/obm/push/store/ehcache/EhCacheConfigurationFileImplTest.java
	java/sync/opush/push-module/src/main/java/org/obm/push/search/ldap/Configuration.java
	java/sync/opush/push-module/src/test/java/org/obm/push/search/ldap/ConfigurationTest.java
	java/sync/services/src/test/java/org/obm/sync/MessagesTest.java
(cherry picked from commit bd588a855f2edde556c93038311b6ec5362a90da)
OBMFULL-6117 Introduced ini4j as a drop-in replacement for ini file parsing

Conflicts:
	java/sync/configuration/pom.xml
	java/sync/configuration/src/main/java/org/obm/configuration/utils/IniFile.java
	java/sync/configuration/src/test/java/org/obm/configuration/utils/IniFileTest.java
	java/sync/opush/push-module/src/test/java/org/obm/push/search/ldap/ConfigurationTest.java
	java/sync/pom.xml
(cherry picked from commit db9f3f18d8299d1f924e5046ff458f28f7c3fcee)
OBMFULL-6118 Add 'port' in DatabaseConfiguration

Conflicts:
	java/sync/configuration/src/main/java/org/obm/configuration/DatabaseConfigurationImpl.java
(cherry picked from commit dc49d8355a4569e9ac31e68bfa102dca317e2cda)
OBMFULL-6118 Add 'readOnly' in DatabaseConfiguration
(cherry picked from commit 4ada58eee335f7d380f6af11479de1b10cbed47a)
OBMFULL-6118 Framework to support multiple database nodes

Conflicts:
	java/sync/configuration/src/main/java/org/obm/configuration/ConfigurationModule.java
	java/sync/configuration/src/main/java/org/obm/configuration/DatabaseConfigurationImpl.java
(cherry picked from commit aaed37f6d456ab1c88cee2ed81f4c03a7c072ef0)
OBMFULL-6118 obm-sync now uses multiple databases.

Conflicts:
	java/sync/dbcp/src/main/java/org/obm/dbcp/DatabaseConnectionProvider.java
	java/sync/services/src/main/java/org/obm/sync/GuiceServletContextListener.java
	java/sync/services/src/main/java/org/obm/sync/RequestScopedDatabaseConnectionProvider.java
(cherry picked from commit bf60d5130467a5d9058f26fe5b29b79cd6407e65)
OBMFULL-6114 Removed old DB drivers from obm-tomcat package
(cherry picked from commit 46bb30e254278ac3eb4947783c8383dbaa3942ed)
OBMFULL-6143 only use the domain to locate SolR server

	(frontport to 3.0)
(cherry picked from commit 20153cbdd3628f03460b91347ec08f31ba6dadee)