Fixed networking with new devstacks

Forceably replace LVM sr with ext if we can (note that VMs existing will cause this to fail)
Merge branch 'master' of https://github.com/citrix-openstack/qa