Uplift url changes from fireplace (bug 975413)

See https://github.com/mozilla/fireplace/pull/384