ServiceLocator refactorings in preparation for CTL-270 / CTL-271 / CTL-272