Bug fixes from tempest testing (see repo: apic-ml2-driver)

Change-Id: I59b5037d7953b3d3dfb3219384d7eb391e9aff85