2055626 divert should deliver things locally when appropriate
4 files changed