Fix so no self-ref links in wiki pages, also better title matches to avoid partials
Merge branch 'origin/7.x-1.x'