Bz1017281 ml2

will clean up this branch once vxlan is merged.  For now it is meant to be an easy way to test both additions.