Add some more template-affected wiki link variants

Change-Id: Ib254c1112f4e62d5e4a7cc2fca6506813b118a77
Merge "Add some more template-affected wiki link variants"