Service interceptor should work for extended services: add changes again

[dtaimanov]

Problem

See #3080 and #3167 Changes from #3080 have been reverted from bugfix release and should be added to next minor release.

Tasks

• apply again changes from #3080,
• get rid of cyclic references in LDAP and webdav addons.