Merge proposals dependent on lp:~and471/indicator-network/edit-connection-dialog-prettification

1. edit-connection-dialog-prettification
2. Dependent merge proposals