Bug 825814 - Proper application uninstall support for the update
manager.
r=julienw
Bug 826289 - Make default bookmarks customisable
Merge pull request #7292 from benfrancis/partner-customisation

Bug 826289 - Make default bookmarks customisable
Merge pull request #7303 from etiennesegonzac/bug-825814-update-manager-onuninstall-fix

Bug 825814 - Proper application uninstall support for the update manager
Bug 826289 - Make default bookmarks customisable. Since git can't have empty folder, change default_data to be js/ for now. a=bustage
Merge pull request #7304 from vingtetun/bustage-fix5

Bug 826289 - Make default bookmarks customisable. Add the folder by defa...
Auto-merge from branch 'master'