ofa_neutron_agent: Fix _phys_br_block_untranslated_traffic

Install the flow to the correct bridge.

Closes-Bug: 1301142
Change-Id: I2aa7ffd6bb297837a39cdd00794af100bf9ab407
(cherry picked from commit 7f5e7c945821b75bd7321bfd0b0c63f2888ac72e)
Brocade mechanism driver should be derived from ML2 plugin base class

Change-Id: Iddcb6a43d60d5c9f472912efdecbb2aaa9b7ea4a
Fixes-bug: #1327001
(cherry picked from commit 99840ff808c290bedd4a9832b3ec880e8909412a)
ofagent: Fix VLAN usage for TYPE_FLAT and TYPE_VLAN

while ofagent uses OF1.3, the current coding incorrectly uses
OF1.0 terms in some places.  namely, _local_vlan_for_flat uses
0xffff to mean "no VLAN".  it should use OFPVID_NONE and
pop_vlan/push_vlan appropriately.  the same problem exists for
reclaim_local_vlan.

Closes-Bug: 1301144
Change-Id: I3df821fd72471f8bd84366e3b5a1cc7e3489156c
(cherry picked from commit 35b0e003e59232d63b8dbd0da511ee8e3877335e)
Merge "ofa_neutron_agent: Fix _phys_br_block_untranslated_traffic" into stable/icehouse
Merge "ofagent: Fix VLAN usage for TYPE_FLAT and TYPE_VLAN" into stable/icehouse
Merge "Brocade mechanism driver should be derived from ML2 plugin base class" into stable/icehouse
Merge branch 'stable/icehouse' of https://github.com/openstack/quantum into stable/icehouse