Revert "Revert "move LocationRedirect changes into their targets""
Revert "Revert "move LocationRedirect changes into their targets""

This reverts commit 043732b88d8babafecd449a464865eb4beb86186.

c3nav/c3nav,c3nav/c3nav,c3nav/c3nav,c3nav/c3nav