Make dial timeouts consistent

[plorenz]

If you call dial with no timeout, you get a 5s timeout. If you call DialWithOptions and no timeout set on the options, you get a 15s timeout. These should probably be the same timeout.