Changelog:
==========
Correct timeout in call to poll.poll (#687)
Revert "Revert "Fix error with select when python process exceeds 1024 open file descriptors"" (#686)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>