Merge pull request #2292 from donaldsharp/fixup_sb_stuff

author Russ White <russ@riw.us>

Fri, 8 Jun 2018 10:52:01 +0000 (06:52 -0400)

committer GitHub <noreply@github.com>

Fri, 8 Jun 2018 10:52:01 +0000 (06:52 -0400)
author Russ White <russ@riw.us>
Fri, 8 Jun 2018 10:52:01 +0000 (06:52 -0400)
committer GitHub <noreply@github.com>
Fri, 8 Jun 2018 10:52:01 +0000 (06:52 -0400)
diff --cc zebra/zebra_mpls.c
Simple merge
diff --cc zebra/zebra_pbr.c
Simple merge
author	Russ White <russ@riw.us>
	Fri, 8 Jun 2018 10:52:01 +0000 (06:52 -0400)
committer	GitHub <noreply@github.com>
	Fri, 8 Jun 2018 10:52:01 +0000 (06:52 -0400)
		1	2
zebra/zebra_mpls.c	patch \|	diff1 \|	diff2 \|	blob \| history
zebra/zebra_pbr.c	patch \|	diff1 \|	diff2 \|	blob \| history