Fixes wrong LSA collision detection and add birdvty group

PR: 232231
Submitted by: Julien Charbon <jcharbon@verisign.com>
Submitted by: Asbjorn Mikkelsen <amikkelsen@verisign.com>
Sponsored by: Verisign