cherry pick server time check from 8.5 branch
Merge pull request #572 from magfest/85port-browsertimecheck

cherry pick server time check from 8.5 branch