Unity Firefox Bookmarks Scope

Merge proposals dependent on lp://staging/~khurshid-alam/unity-scope-firefoxbookmarks/fix-build-disco

  1. fix-build-disco
  2. Dependent merge proposals

lp://staging/~khurshid-alam/unity-scope-firefoxbookmarks/fix-build-disco has no merge proposals.