Merge proposals dependent on lp:~salgado/linaro-image-tools/fix-mocking

lp:~salgado/linaro-image-tools/fix-mocking has no merge proposals.