WIKI-929 improve the way to get wiki
Merge commit 'eeecfc38b93dd60dc2b828b61f861ed8f2071352' into HEAD