issue #21894: Make sure we handle address locking issues.
issue #21894: Fix problem causing tests to fail.
Merge pull request #1028 from jrogelstad/21894

issue #21894: Fix address problems.