AS7-6297 Remove OSGi from default configs & introduce new OSGi config

...s, and introduce OSGi configuration