Address more review comments
Merge branch 'n1k-plugin' of https://github.com/CiscoSystems/quantum into n1k-plugin