Contrail/havana-config-devel merge to contrail/havana