Merge "Cleanup devstack spinup script"