Merge proposals dependent on lp:~ci-train-bot/persistent-cache-cpp/persistent-cache-cpp-ubuntu-xenial-landing-029

1. persistent-cache-cpp-ubuntu-xenial-landing-029
2. Dependent merge proposals