Merge branch 'bp/images-v2' of https://github.com/sw00/cloudroast into bp/images-v2

Change-Id: I0173393b7d9eb77a517ac0bd7033d9c6c7d4a4f7
Merge branch 'bp/images-v2' of https://github.com/sw00/cloudroast into bp/images-v2