Merge change 9672

* changes:
  Adaptive heartbeat protocol implementation: server configured settings.