Merge proposals dependent on lp://qastaging/~manishsinha/gnome-activity-journal/fixes-831436-gaj-notloading-oneiric

1. fixes-831436-gaj-notloading-oneiric
2. Dependent merge proposals