Minor fixes to make all the unit tests pass both with and without MPLS
Minor fixes to make all the unit tests pass both with and without MPLS

waltznetworks/pox,diogommartins/pox,PrincetonUniversity/pox,adusia/pox,andiwundsam/_of_normalize,andiwundsam/_of_normalize,xAKLx/pox,adusia/pox,VamsikrishnaNallabothu/pox,denovogroup/pox,denovogroup/pox,PrincetonUniversity/pox,chenyuntc/pox,denovogroup/pox,kpengboy/pox-exercise,kulawczukmarcin/mypox,waltznetworks/pox,chenyuntc/pox,noxrepo/pox,pthien92/sdn,xAKLx/pox,andiwundsam/_of_normalize,noxrepo/pox,VamsikrishnaNallabothu/pox,diogommartins/pox,kulawczukmarcin/mypox,VamsikrishnaNallabothu/pox,pthien92/sdn,jacobq/csci5221-viro-project,kavitshah8/SDNDeveloper,PrincetonUniversity/pox,jacobq/csci5221-viro-project,waltznetworks/pox,kulawczukmarcin/mypox,carlye566/IoT-POX,carlye566/IoT-POX,adusia/pox,waltznetworks/pox,MurphyMc/pox,kavitshah8/SDNDeveloper,xAKLx/pox,diogommartins/pox,xAKLx/pox,diogommartins/pox,chenyuntc/pox,VamsikrishnaNallabothu/pox,kavitshah8/SDNDeveloper,adusia/pox,andiwundsam/_of_normalize,kpengboy/pox-exercise,pthien92/sdn,carlye566/IoT-POX,MurphyMc/pox,chenyuntc/pox,jacobq/csci5221-viro-project,diogommartins/pox,carlye566/IoT-POX,pthien92/sdn,MurphyMc/pox,pthien92/sdn,kulawczukmarcin/mypox,carlye566/IoT-POX,PrincetonUniversity/pox,VamsikrishnaNallabothu/pox,adusia/pox,noxrepo/pox,kpengboy/pox-exercise,denovogroup/pox,kavitshah8/SDNDeveloper,jacobq/csci5221-viro-project,MurphyMc/pox,noxrepo/pox,PrincetonUniversity/pox,kpengboy/pox-exercise,denovogroup/pox,chenyuntc/pox,waltznetworks/pox,jacobq/csci5221-viro-project,xAKLx/pox,MurphyMc/pox,kulawczukmarcin/mypox,kpengboy/pox-exercise