DEV-21040
moved definition of settings keys to a separate file
DEV-21040 continued
Merge branch 'feature/DEV-21040' into dev