Merge proposals dependent on lp://staging/~iahmad/ubuntu-autopilot-tests/add-recipient-to-sms-bug1322055

1. add-recipient-to-sms-bug1322055
2. Dependent merge proposals