Fix Half 971244: Fix first half of 971244 - Move redirects to bedrock conf.
Merge pull request #1744 from bensternthal/971244_trap_redirects

Fix first half of 971244 : Move "trap" & "attack "redirects to bedrock conf