Merge proposals dependent on lp://staging/~ci-train-bot/telephony-service/telephony-service-ubuntu-xenial-landing-017

1. telephony-service-ubuntu-xenial-landing-017
2. Dependent merge proposals