Sync in matchmaker and qpid Conf changes from oslo

The following should use integers not strings.
* matchmaker_heartbeat_freq
* matchmaker_heartbeat_ttl
* qpid_port

Fixes bug 1159889 and bug 1161679

Change-Id: I2f055929ffa48ead300d2a3efdb0ce0692a13716
(cherry picked from commit 94783b2158e9b92d40974b9bb0738426e2162066)
Merge "Sync in matchmaker and qpid Conf changes from oslo" into milestone-proposed