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
Merge "Fix default values for Matchmaker IntOpts"