UI used group vrfs together by the route distinguisher only. This causes problems when route distinguishers are not configured for every vrf.
The UI now groups by vrf name AND the route distinguisher.
Also unset the port variable before using it in the code.
DO NOT DELETE THIS TEXT
#### Please note
> Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting.
- [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/)
#### Testers
If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926`
vivia11andNeil Lathwood
d88d230a02