test_xmlutil.py covers more code in xmlutil.py

95% is covered now.

Change-Id: Icdcc4d423a0fc5ebd2433a3f072108f8d7ecb033
Fixes: bug #828617
Add missing matchmaker_ring

commit b5a3d05 synced this change:

  1d7920a Extract matchmaker_ring to own module

but forgot to include the new matchmaker_ring module.

Change-Id: I21f3bc099d48accc4dd631bebfe914dd24f8e722
Sync latest rpc changes from oslo-incubator

Includes these commits:

 3006787 Sanitize passwords in _safe_log
 c37f6aa Add support for heartbeating in the kombu RPC driver
 323e465 Add conditional exception reraise
 dea334a Replace sys.exit by a RPCException
 719eba4 Don't reconnect to exclusive fanout consumers.
 22ec8ff Make AMQP based RPC consumer threads more robust
 13650b1 rpc: remove some unused serialization code
 e204885 Optionally reject messages on exception.
 688832f Remove unused zmq relay functionality

Change-Id: I8629c271bc00571783f9b77ec36034945df9a583
Merge "test_xmlutil.py covers more code in xmlutil.py"
Merge "Add missing matchmaker_ring"
Merge "Sync latest rpc changes from oslo-incubator"
Merge remote-tracking branch 'm_src_repo/citrix-fixes' into build-temp