Merge proposals dependent on lp://qastaging/~andrey-konovalov/linaro-ci/bug1151062

lp://qastaging/~andrey-konovalov/linaro-ci/bug1151062 has no merge proposals.