APD-96: Refactoring of ConfigurationService
Merge branch 'APD-96-hla-refaconf' into develop