Merge changes Ibcb91105,I0218f367

* changes:
  Limit unprivileged keepalives per uid
  Support customization of supported keepalive count per transport
tree: c03110393e4ab6438d2fb6aa59b9c60b2139264f
  1. core/
  2. services/
  3. tests/