Merge commit 'd7185d0bd250ff5f006ea94d305539ac7d499977' * commit 'd7185d0bd250ff5f006ea94d305539ac7d499977': Fix test breakage in testNickNameV21().
Merge commit 'd7185d0bd250ff5f006ea94d305539ac7d499977' * commit 'd7185d0bd250ff5f006ea94d305539ac7d499977': Fix test breakage in testNickNameV21().