Merge "Sync in matchmaker and qpid Conf changes from oslo"
This commit is contained in:

committed by
Gerrit Code Review

parent
0287d81767
commit
e17a3d75d7