Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Adding VPC support to the Cisco plugin

Adding VPC(Virtual Port Channel) support to the Cisco plugin.

Change-Id: Ibe954a680df643d5964230af16fb132ec9d5b4fd