Bug 879815 - Fix support for https URLs
Review fixes