[#LIB-155] Refactor configuration | cdi prefs support - only interface is left
[#LIB-155] Refactor configuration | minor refactoring