Merge proposals dependent on lp://staging/~timrchavez/ubuntu-system-image/server-cli-scripts-wip

1. server-cli-scripts-wip
2. Dependent merge proposals