Merge proposals dependent on lp:~kvalo/indicator-network/settings-datadir-fix

lp:~kvalo/indicator-network/settings-datadir-fix has no merge proposals.