Reapplied changeset 31ff9550fba6 (bug 870073)
Bug 870768 - Disable verify url test. r=gbrown