Merge proposals dependent on lp://qastaging/~vbocek/ubuntu-system-image/server-add-remote-device-option

1. server-add-remote-device-option
2. Dependent merge proposals