Merge changes Ibcb91105,I0218f367

* changes:
  Limit unprivileged keepalives per uid
  Support customization of supported keepalive count per transport