Bug 978371 - Fix editing bookmark URLs
Merge pull request #16848 from benfrancis/978371

Bug 978371 - Fix editing bookmark URLs r=vingtetun