Merge pull request #7307 from kpayson64/port_server_timeout

Added timeout to port server