FLUME-2311 - Use standard way of finding queue/topic (Hugo Lassiège via Brock Noland)