Merge "Fix hypervisor count for all-in-one devstack"