Merge remote-tracking branch 'origin/cmaster' into cmaster-next

Conflicts:
	debian/changelog
	zebra/zebra_rnh.c

diff --cc zebra/zebra_rnh.c
index fdb187a23a6db089d76d37c19106084b904f0bfe,be1411091427ae303dee4e97847f15a9c279c65b..8df9277cb34c74b9e8f29e66a6af55c2111fc976
--- 1/zebra/zebra_rnh.c
--- 2/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@@ -581,20 -577,22 +578,22 @@@ zebra_rnh_process_static_routes (vrf_id
              }
          }
  
-       if (IS_ZEBRA_DEBUG_NHT)
-         {
-           prefix2str(&static_rn->p, bufs, INET6_ADDRSTRLEN);
-           if (prn && rib)
-             zlog_debug("%u:%s: NH change %s, scheduling static route %s",
-                        vrfid, bufn, num_resolving_nh ?
-                         "" : "(filtered by route-map)", bufs);
-           else
-             zlog_debug("%u:%s: NH unreachable, scheduling static route %s",
-                        vrfid, bufn, bufs);
+         if (IS_ZEBRA_DEBUG_NHT)
+           {
+             prefix2str(&static_rn->p, bufs, INET6_ADDRSTRLEN);
+             if (prn && rib)
+               zlog_debug("%u:%s: NH change %s, scheduling static route %s",
+                          vrfid, bufn, num_resolving_nh ?
+                          "" : "(filtered by route-map)", bufs);
+             else
+               zlog_debug("%u:%s: NH unreachable, scheduling static route %s",
+                          vrfid, bufn, bufs);
+           }
+ 
 -          SET_FLAG(srib->flags, ZEBRA_FLAG_CHANGED);
++          SET_FLAG(srib->status, RIB_ENTRY_CHANGED);
+           SET_FLAG(srib->status, RIB_ENTRY_NEXTHOPS_CHANGED);
          }
  
-       SET_FLAG(srib->status, RIB_ENTRY_CHANGED);
-       SET_FLAG(srib->status, RIB_ENTRY_NEXTHOPS_CHANGED);
        rib_queue_add(static_rn);
      }
  }