Fixed conflict
Merge branch 'n1k-plugin' of http://github.com/CiscoSystems/quantum into n1k-plugin