Merge proposals dependent on lp://staging/~jm-leddy/network-manager-applet/enable-disable-disconnect-notification

1. enable-disable-disconnect-notification
2. Dependent merge proposals