[MERGE] Fix for the bzr+https URL issue

[Jeff Abbott]

Robert Collins wrote:

> Robert Collins has voted approve.
> Status is now: Conditionally approved
> Comment:
> I say take the fix and file a critical bug to improve test facilities here

As John mentioned, my Python inexperience and lack of familiarity with 
the Bazaar codebase make me hesitant to nominate myself as the one to 
write the tests for this issue.  I am, however, a bug-filing machine and 
would be happy to file a separate issue (aside from 198793) about the 
testing discrepancy, unless someone else wants to do so.

Thanks,
Jeff