Merge "Copy epoll(2) changes to minadb."