[OXT-76 v1] merge patch queues and remove xenclient-pq