Fix redirects for contrib keys.
Fix a failing test.
Merge pull request #1374 from NatTuck/contrib-key-redirects

Fix redirects for contrib keys.