Merge "Bug 1378: Make sure config extender does not block bundle loading."