Fix default values for Matchmaker IntOpts

The following should use ints not strings.
* matchmaker_heartbeat_freq
* matchmaker_heartbeat_ttl

Fix bug 1159889

Change-Id: If2ce034d2a9876dbe6b232a1f5d73367d29074b0
(cherry picked from commit 5c825e4ddcf0aa980ec61c0e420328169b5a9ed6)
Set gitreview default branch to stable/grizzly

Change-Id: I7df543bbfd89f580ce66363a23dfafee51a5059f
Mark sql_connection with secret flag

sql_connection contains the password in some setups and marking as
secret prevents accidental logging

fixes bug 1160680

Change-Id: Ib2d00219ea40a010c62e6a29045309f030e6de28
(cherry picked from commit f79915ec1d975219719e0ba99128d7c62398ae0a)
Change qpid_port to IntOpt

Fixes bug 1161679

Change-Id: I4b64fccbb7871dfab4fb74534514aa269c31f03d
(cherry picked from commit cb6d2ed2c1eda7b72c898b0a61eeed10202b9d54)
Merge "Change qpid_port to IntOpt" into stable/grizzly
Merge "Set gitreview default branch to stable/grizzly" into stable/grizzly
Merge "Mark sql_connection with secret flag" into stable/grizzly
Merge remote-tracking branch 'upstream/stable/grizzly' into grizzly