Convert directory services to plugins.
Merge branch 'master' into pimp-pin