Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  HeartbeatDaemon: Use Logger's built-in String formatting

Change-Id: Ic2f2a264e1619cb5c8060746f8152d8ba5d62091