Merge "Cleanup ServiceWiring/LBFactoryMW interaction"