BAC-508: move testBlock to RenameUser
BAC-508: switch to new helper function
Merge pull request #1038 from Wikia/release-170-hotfix-BAC-508

Release 170 hotfix BAC-508