Merge branch 'ticket27359_v2_squashed'

diff --cc src/core/include.am
Simple merge

diff --cc src/feature/nodelist/nodelist.c
index 9ddb71e8a6d8eb74d71cc40cd269963fcb17659f,d070f31c121ca9a2a706accf230f15f1f1eeaef6..f93ecd5bfe0829a4bd69a9f3df9aabd2f7f3b298
--- 1/src/feature/nodelist/nodelist.c
--- 2/src/feature/nodelist/nodelist.c
+++ b/src/feature/nodelist/nodelist.c
@@@ -1930,17 -1965,12 +1973,12 @@@ nodes_in_same_family(const node_t *node
    }
  
    /* Are they in the same family because the agree they are? */
-   {
-     const smartlist_t *f1, *f2;
-     f1 = node_get_declared_family(node1);
-     f2 = node_get_declared_family(node2);
-     if (f1 && f2 &&
-         node_in_nickname_smartlist(f1, node2) &&
-         node_in_nickname_smartlist(f2, node1))
-       return 1;
+   if (node_family_contains(node1, node2) &&
+       node_family_contains(node2, node1)) {
+     return 1;
    }
  
 -  /* Are they in the same option because the user says they are? */
 +  /* Are they in the same family because the user says they are? */
    if (options->NodeFamilySets) {
      SMARTLIST_FOREACH(options->NodeFamilySets, const routerset_t *, rs, {
          if (routerset_contains_node(rs, node1) &&