Increase the default poll duration for Cisco n1kv

Increase the poll duration for Cisco N1Kv, from 10s to 60s and also
clean up the /etc/neutron/plugins/cisco/cisco_plugins.ini file. The
current poll duration of 10s causes that VSM to unnecessarily taking
frequent CPU cycles, resulting in the failure of other tasks in scale
configurations.

Closes-Bug: 1357030
(cherry picked from commit 6e08e477a9cb46b1d371c2c9812e5ce9f4cf69be)

Conflicts:
	etc/neutron/plugins/cisco/cisco_plugins.ini
	neutron/plugins/cisco/common/config.py

Change-Id: I95747f35bae5b7157391c1698c0fe84d2126aa10
Create 'quota' table in folsom_initial

When using the stable icehouse branch
folsom_initial db migration does not create quotas table
for a plugin which had db quota support (quota-ext).

This bug was fixed as part of bug 1207402 in master.
Since this bug cannot be back ported, we back port only
the quota table related fix.

Closes-bug: #1372678

Change-Id: I933aaefb50e32234eaad5557322e4c89af2a47d0
Big Switch: Don't clear hash before sync

This patch removes the step of clearing the consistency
hash from the DB before a topology sync. This will ensure
that inconsistency will be detected if the topology sync
fails.

This logic was originally there to make sure the hash header
was not present on the topology sync call to the backend.
However, the hash header is ignored by the backend in a sync
call so it wasn't necessary.

Closes-Bug: #1379510
Change-Id: I2d58fa2aea3b692834d64192d06ace727c7df8a0
(cherry picked from commit 24e4110eb284078775496501ff81630eb1619c11)
Remove unused py33 tox env

It's apparent that Neutron is not expected to gain Py3K support on
its stable/icehouse branch, and so developers are not expected to
run the py33 tox env.

Change-Id: Ieae7819e0489ae19b7fcfb63497e06527c918b5c
Big Switch: Switch to TLSv1 in server manager

Switch to TLSv1 for the connections to the backend
controllers. The default SSLv3 is no longer considered
secure.

TLSv1 was chosen over .1 or .2 because the .1 and .2 weren't
added until python 2.7.9 so TLSv1 is the only compatible option
for py26.

Conflicts:

	neutron/tests/unit/bigswitch/test_servermanager.py
    Unit test changes couldn't be back-ported because they don't
    exist in Icehouse.

Closes-Bug: #1384487
Change-Id: I68bd72fc4d90a102003d9ce48c47a4a6a3dd6e03
(cherry picked from commit 62588957fbeccfb4f80eaa72bef2b86b6f08dcf8)
Check for IPv6 file before reading

Check to see if the IPv6 disabled flag file exists
before trying to read it. This file doesn't exist
on systems with the IPv6 module blacklisted.

Closes-Bug: #1361542
Change-Id: I4064b4189cc9d8f0f0e0e7025cf6f83d5b6ec276
(cherry picked from commit 0c963f6140237d8d3f361c6aaa7d2a6b656504db)
Fix a recent ipv6 UT regression

This fixes UT failures on systems without the procfs entry
by adding appropriate mocking.  The problem introduced by
the following change:
    https://review.openstack.org/#/c/116826/
    commit 0c963f6140237d8d3f361c6aaa7d2a6b656504db

Also, add a test for the case which the change in question fixed.

Closes-Bug: #1363805
Related-Bug: #1361542
Change-Id: I72842c3446f3275e2288adc411540ab036025ed0
(cherry picked from commit 6f5f14872387f3814d3c421f07e68f6ce45f7d7d)
Merge "Create 'quota' table in folsom_initial" into stable/icehouse
Merge "Big Switch: Don't clear hash before sync" into stable/icehouse
Merge "Check for IPv6 file before reading" into stable/icehouse
Merge "Remove unused py33 tox env" into stable/icehouse
Merge "Fix a recent ipv6 UT regression" into stable/icehouse
Merge "Big Switch: Switch to TLSv1 in server manager" into stable/icehouse
Merge "Increase the default poll duration for Cisco n1kv" into stable/icehouse
NSX: allow multiple networks with same vlan on different phy_net

Previously, the NSX plugin prevented one from creating multiple networks on
the same vlan even if they were being created on different physical_networks.
This patch corrects this issue and allows this to now occur.

Closes-bug: 1367034

Change-Id: I343449648304328dffdd5ba070491e05686ee22d
(cherry picked from commit 6d1f864531d169a54bc239561840176012629316)
Merge "NSX: allow multiple networks with same vlan on different phy_net" into stable/icehouse
Big Switch: Fix SSL version on get_server_cert

The ssl.get_server_certificate method uses SSLv3 by default.
Support for SSLv3 was dropped on the backend controller in
response to the POODLE vulnerability. This patch fixes it
to use TLSv1 like the wrap_socket method.

Closes-Bug: #1384487
Change-Id: I9cb5f219d327d62168bef2d7dbee22534b2e454e
(cherry picked from commit 77e283c94f51e21dcf126a316098c54a7cdfca0f)