1. Added match-in-vrf support
2. Fix for router_deleted message