Merge proposals dependent on lp://qastaging/~gnome-zeitgeist/gnome-activity-journal/nautilus-journal

1. nautilus-journal
2. Dependent merge proposals