[Bug 899510] Fix support using multiple base URLs for a repo