move third-level links, refs #4311
Merge branch 'v2-4311' into 7.x-1.x