Fix dangerous use of optional fields in ML2
Fix dangerous use of optional fields in ML2

Change-Id: Ifa438e51f4e097a18d0f23f1c2ae881f4fe9369e
Closes-bug: #1596121

openstack/dragonflow,openstack/dragonflow,openstack/dragonflow