Fixed AddRouter normally and fixes in Messaging

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>
Fixed AddRouter normally and fixes in Messaging merge conflicts fix

Signed-off-by: Thierry <thierry.van.loo.tvl@gmail.com>