Merge changes I0baf582f,I4bba01ba

* changes:
  Block unpriviledged apps which create keepalives with null fd
  Fix keepalive don't get removed when lower layer error
tree: e24f86e128b714cea0147cb2b73678c986a9aec7
  1. core/
  2. services/
  3. tests/