Merge proposals dependent on lp:~jonas-drange/ubuntu-system-settings/wifi-other-network-label-fix-1365984

1. wifi-other-network-label-fix-1365984
2. Dependent merge proposals