Merge branch 'master' into feature/stabilization
COMMONS-305 : FutureCache exception when portal is reloaded

Fix description:
- Refactor SettingService class
Merge branch 'feature/stabilization'

Conflicts:
	commons-component-common/src/main/java/org/exoplatform/settings/chromattic/SynchronizationTask.java