Bug 956392: Escape ampersands in links

Found some unescaped ampersands when looking at Bug 956392.