Revert "WIKI-769 Wiki syntax error"

This reverts commit 77fdbdea287dffb84f1b557fee5ca3b6bfbafbcc.
Revert "WIKI-844: Cannot open wiki page when wiki portlet locates in new site"

This reverts commit 94b894e4d99e14033d52be5d00a26fa49bcfe4d9.
Merge commit '4b2456450149813a2639e583caef7a79cb8c0ab1' into HEAD