Merge "Have ServiceContainer implement PSR-11"