Merge proposals dependent on lp:~ken-vandine/unity-lens-friends/libunity7-compatible_strip_links

1. libunity7-compatible_strip_links
2. Dependent merge proposals