Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I7053f7df5889e3a9e9b19e6b5042ccee14017b86