Merge proposals dependent on lp:~michael.nelson/ubuntu-webcatalog/1039073-use-click-url-when-available

1. 1039073-use-click-url-when-available
2. Dependent merge proposals