QPID-3769 Applying a modified version of a patch from Siddesh Poyarekar. The original patch did a literal comparison of the address strings which can cause issues if it had white spaces. The modified version matches the type and name.