Apply commit from master that varies ports during tests

This is basically a cherry-pick of

ceee8a185250bb6b5f52e56c7ed9457408b6cb0a

from master, which should provide enough variance in
the ports used for webrick/mongrel spec tests to
reduce or eliminate the transient "address already
in use" failures