Fixing incorrect ++it++ with ++it

Change-Id: I5981ed287ea6b4049fdf75067bdeb69c8a62a8ad
Merge "Fixing incorrect ++it++ with ++it"
Move a few more bgp tests off flaky list

Change-Id: I10b3a0eadbb1f8947da9d41b6e5233c10d393829