Backport r378663 from branches/1.8

This will help reduce duplicate calls for queue members

Change-Id: I858242d0093bbb852c9a96385482daa66bebd227
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>