Merge proposals dependent on lp://staging/~canonical-platform-qa/ubuntu-system-tests/fix-get-clock-pid

1. fix-get-clock-pid
2. Dependent merge proposals