Unify ContainerMiddleware with EnsureRequestServices

@davidfowl