Merge "Fix DevStack to configure tempest's service_availability"