merged Justin Santa Barbara's raw-disk-image back into the latest trunk
merged Justin Santa Barbara's raw-disk-image back into the latest trunk

openstack-dev/hacking,emonty/oslo-hacking,zancas/hacking,emonty/oslo-hacking,openstack-dev/hacking,hyakuhei/cleantox,hyakuhei/cleantox,zancas/hacking