production stomp is fussy about /queue/ prefix

Change-Id: Iaca8436358421556b6228ba3792fd3470c25b10a
Merge remote-tracking branch 'origin/master' into HEAD

* production stomp is fussy about /queue/ prefix

Change-Id: Ifcc2e34aa49512a7488711cb5419c6f29dbf235c