fix sending extraLabels for QuantServe, and change it so it's similar to...

... Mercury

(cherry picked from commit 9caaf63)