Merge "Fail fast if somebody is adding default routes" into jb-mr2-dev