fix sending extraLabels for QuantServe, and change it so it's similar to Mercury
(cherry picked from commit 9caaf63)
Merge pull request #5709 from Wikia/release-255-HG-454

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