Bug 991149 - Refactor Plugin Container Services initialization