SQUASH: nova-bm

Change-Id: If533d0584e8e5de76c0fc45b88c5465541a82ff5
SQUASH: nova-virt

Change-Id: I28f2117c9eb7c5497c62c564098f6effab3859c0