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
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)
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 "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
Merge branch 'stable/icehouse' of https://github.com/openstack/quantum into stable/icehouse