Merge proposals dependent on lp://qastaging/~tom-gall/linaro/live-helper-config.maverick.linaro-project-chi-dev

1. live-helper-config.maverick.linaro-project-chi-dev
2. Dependent merge proposals