pulled in upstream loxi changes
pulled in upstream loxi changes

Change-Id: I6b8bd5c3f7cd24a5d4f9d5da378bd7f606efdd8e

SmartInfrastructures/dreamer,sdnwiselab/onos,jinlongliu/onos,oplinkoms/onos,Shashikanth-Huawei/bmp,VinodKumarS-Huawei/ietf96yang,opennetworkinglab/onos,chenxiuyang/onos,CNlukai/onos-gerrit-test,opennetworkinglab/onos,donNewtonAlpha/onos,donNewtonAlpha/onos,rvhub/onos,planoAccess/clonedONOS,mengmoya/onos,maheshraju-Huawei/actn,packet-tracker/onos,lsinfo3/onos,jinlongliu/onos,sonu283304/onos,oeeagle/onos,zsh2938/onos,oeeagle/onos,mengmoya/onos,jmiserez/onos,oplinkoms/onos,kkkane/ONOS,kuangrewawa/onos,packet-tracker/onos,packet-tracker/onos,Shashikanth-Huawei/bmp,mengmoya/onos,CNlukai/onos-gerrit-test,chenxiuyang/onos,gkatsikas/onos,maheshraju-Huawei/actn,planoAccess/clonedONOS,sdnwiselab/onos,mengmoya/onos,oeeagle/onos,LorenzReinhart/ONOSnew,SmartInfrastructures/dreamer,rvhub/onos,y-higuchi/onos,Shashikanth-Huawei/bmp,jmiserez/onos,castroflavio/onos,opennetworkinglab/onos,chenxiuyang/onos,donNewtonAlpha/onos,oplinkoms/onos,sdnwiselab/onos,lsinfo3/onos,donNewtonAlpha/onos,VinodKumarS-Huawei/ietf96yang,jinlongliu/onos,y-higuchi/onos,maheshraju-Huawei/actn,Shashikanth-Huawei/bmp,gkatsikas/onos,castroflavio/onos,donNewtonAlpha/onos,sdnwiselab/onos,chinghanyu/onos,castroflavio/onos,kuujo/onos,ravikumaran2015/ravikumaran201504,jmiserez/onos,y-higuchi/onos,SmartInfrastructures/dreamer,opennetworkinglab/onos,oplinkoms/onos,kkkane/ONOS,CNlukai/onos-gerrit-test,oplinkoms/onos,CNlukai/onos-gerrit-test,chinghanyu/onos,rvhub/onos,rvhub/onos,Shashikanth-Huawei/bmp,LorenzReinhart/ONOSnew,osinstom/onos,oplinkoms/onos,kkkane/ONOS,kuujo/onos,kuujo/onos,ravikumaran2015/ravikumaran201504,LorenzReinhart/ONOSnew,jmiserez/onos,kuujo/onos,kuangrewawa/onos,kuangrewawa/onos,LorenzReinhart/ONOSnew,osinstom/onos,zsh2938/onos,sdnwiselab/onos,maheshraju-Huawei/actn,maheshraju-Huawei/actn,sonu283304/onos,VinodKumarS-Huawei/ietf96yang,chinghanyu/onos,y-higuchi/onos,opennetworkinglab/onos,kuujo/onos,oeeagle/onos,gkatsikas/onos,VinodKumarS-Huawei/ietf96yang,gkatsikas/onos,osinstom/onos,ravikumaran2015/ravikumaran201504,chinghanyu/onos,gkatsikas/onos,planoAccess/clonedONOS,sonu283304/onos,lsinfo3/onos,kuujo/onos,kkkane/ONOS,osinstom/onos,castroflavio/onos,opennetworkinglab/onos,jinlongliu/onos,sonu283304/onos,VinodKumarS-Huawei/ietf96yang,osinstom/onos,oplinkoms/onos,LorenzReinhart/ONOSnew,mengmoya/onos,planoAccess/clonedONOS,sdnwiselab/onos,chenxiuyang/onos,gkatsikas/onos,lsinfo3/onos,y-higuchi/onos,zsh2938/onos,kuujo/onos,zsh2938/onos,packet-tracker/onos