Merge proposals dependent on lp:~jerith/kali/nick-change-fix

lp:~jerith/kali/nick-change-fix has no merge proposals.