Merge commit 'cd3b02d198093abbbe671f647e4deb2470eb9cf1' into integrated

diff --cc nest/iface.c
index 1664670e46b525c670831cd06951bcc496f44ea4,b4ab70c3adf355c2e0dfcc284912a55d412ece0d..d3d014164c9f92d57d1384386d16ffd2587dcbca
--- 1/nest/iface.c
--- 2/nest/iface.c
+++ b/nest/iface.c
@@@ -600,14 -600,14 +600,6 @@@ if_choose_router_id(struct iface_patt *
          if (a->scope <= SCOPE_LINK)
            continue;
  
--        /* FIXME: This should go away */
--        if (a->flags & IA_PEER)
--          continue;
--
--        /* FIXME: This should go away too */
--        if (!mask && (a != i->addr))
--          continue;
--
          /* Check pattern if specified */
          if (mask && !iface_patt_match(mask, i, a))
            continue;