reapply keystone hack
Use diskimage-builder=0.1.9