Bug 988172 - Create datastore for bookmarks and extract the UI to add th...

...em to system