Sync with Juniper/neutron#contrail/havana-R1.06

This commit cherry-pick commits from Juniper/neutron from https://github.com/Juniper/neutron/compare/365fd1a079384cac1360033cb015561d39b1b859...contrail%2Fhavana-R1.06