Cisco plugin (grizzly) does not pass proper args.

Fixes bug 1213147

The Cisco plugin in grizzly does not pass proper arguments to
the enable_vlan_on_trunk_int() method in cisco_nexus_network_driver_v2.
The definition calls for 4 arguments (not counting self):

    def enable_vlan_on_trunk_int(self, mgr, nexus_switch,
                                 interface, vlanid)

but the call in the nexus driver passes only 3 arguments:

    self._client.enable_vlan_on_trunk_int(man,
                                          port_id,
                                          vlan_id)

Change-Id: Ie51affe692151a2ac92f22450e2e70b1005f3507
Merge "Cisco plugin (grizzly) does not pass proper args." into stable/grizzly
Merge branch 'stable/grizzly' of https://github.com/openstack/quantum into grizzly/stable