[Merge] lp:~rpadovani/webbrowser-app/remove-404-history into lp:webbrowser-app

[Olivier Tilloy]

With the recent changes that landed in trunk, there are now conflicts when merging this branch, can you please address them? Thanks!
-- 
https://code.launchpad.net/~rpadovani/webbrowser-app/remove-404-history/+merge/259313
Your team Ubuntu Phablet Team is subscribed to branch lp:webbrowser-app.