Merge proposals dependent on lp://qastaging/~sil2100/ubuntu-system-image/server_script_testability

1. server_script_testability
2. Dependent merge proposals