Moved classes in config files to separate files (and locked janus back to 1.1.6)
Merge branch 'develop' of https://github.com/OpenConext/OpenConext-serviceregistry into develop