CMS-1084 Use simpler DI framework. First merge. No real change to the runtime yet.