Merge proposals dependent on lp:~giuseppeterrasi-deactivatedaccount/serverguide/fix-multipath

1. fix-multipath
2. Dependent merge proposals