Increase relays to compensate for smaller guard fraction #2

Increase relays to compensate for smaller guard fraction in mixed,
bridges, and bridges+ipv6 flavours.
Merge remote-tracking branch 'teor/issue-13161-template-tweaks'