Merge changes I92f6d977,I06840834 into qt-dev

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