Remove useless <br \> in highlight blocks. (r1741864 in 2.4.x + small tweak because quoting is different. This will be fixed later on)