Updated from global requirements

Change-Id: I576919f28d7dd1a04ce1a3795bbf940b82d0d76f
NSX: ensure dhcp port is setup on metadata network

Change in scheduling behavior caused a regression
where the dhcp port is no longer provisioned on
the (admin) metadata network created when a subnet
is uplinked to a router.

This change recovers the past behavior and extend UT
coverage to avoid further regression.

Closes-bug: #1304127

Change-Id: I8420203f68a43368f3784adb0c4cbbe55f048662
Merge "Updated from global requirements"
Merge "NSX: ensure dhcp port is setup on metadata network"