Multiple routers and better rfc3442 implementation

Change-Id: I8bdaed91e0ee723dea871208e8085ef57b224087
2 files changed