Merge "Adding "wait_for_zone_import_status" to stable:"