Merge "fix regression in "epoll: Keep a reference on files added to the check list""