N1kv ml2 driver - 7

Resolve pep8 conflicts.

Change-Id: Iefb9331fbb11bf90524ee5cdbb862fbc8d187844