Test: Temporarily change delete/put_mapping to wait for green
Delete and update mapping execution order has changed with #6762