Additional cleanup in OF config file - inject providers as map
Merge branch 'OpenfireDEMO' into release-4.6-unstable