Add small delay on first call to wait-on-server before trying to start a server.