Do not access set element iterator after it is erased
Do not access set element iterator after it is erased

Change-Id: Ie025da832e063d0b7e40f6050f4c0df6420ab3a0
Closes-Bug: 1684310

nischalsheth/contrail-controller,nischalsheth/contrail-controller,rombie/contrail-controller,nischalsheth/contrail-controller,nischalsheth/contrail-controller,nischalsheth/contrail-controller,rombie/contrail-controller,eonpatapon/contrail-controller,nischalsheth/contrail-controller,rombie/contrail-controller,rombie/contrail-controller,rombie/contrail-controller,nischalsheth/contrail-controller,eonpatapon/contrail-controller,eonpatapon/contrail-controller,rombie/contrail-controller,eonpatapon/contrail-controller,nischalsheth/contrail-controller,eonpatapon/contrail-controller,rombie/contrail-controller,eonpatapon/contrail-controller,eonpatapon/contrail-controller