Big Switch: Don't use MagicMocks unnecessarily

Replace the mocks purely being used to block external
calls with functions that just return and don't record
calls.

Closes-Bug: #1315574
Change-Id: I79533135b5cb456d941ddffa62f5365970146a7e
Sync service module from oslo-incubator

This is needed for the stop method now implemented in service.py used here:
https://review.openstack.org/#/c/72564

Current oslo-incubator commit on HEAD
ad3c887fbfc81ac3502a3e49c1ed6c2824029c25

Change-Id: I66901c0c42472be1aadab803958932bcb9be8ee1
Added note to neutron.conf

Added note to neutron.conf which clarifies where database
connection attribute should be set.

Change-Id: Ic0631cff789046528cae8622d935b65ae9b012cb
Closes-Bug: #1261298
Big Switch: Call correct method in watchdog

Updates the consistency watchdog fuction to call
the correct rest method.

Closes-Bug: #1328321
Change-Id: I86ce0af36f6764a3f1e789602cef52758caedc8b
NeutronManager: Remove explicit check of the existence of an attribute

To simplify the code a little.  No functional changes.

Change-Id: I862bb2a3d2bf808826c31888f3401709a1be086f
Updated from global requirements

Added exclusions for newly triggered errors.

Change-Id: I580c4a6a3861c399e010f435c0b92ed719d6a418
remove E112 hacking exemption and fix errors

Change-Id: I6031ad2274c677b071a03068e5fb3c000fec7723
Partial-Bug: 1329017
Merge "Big Switch: Call correct method in watchdog"
Merge "Big Switch: Don't use MagicMocks unnecessarily"
Merge "Updated from global requirements"
Merge "remove E112 hacking exemption and fix errors"
Merge "NeutronManager: Remove explicit check of the existence of an attribute"
Merge "Added note to neutron.conf"
Merge "Sync service module from oslo-incubator"
Merge remote-tracking branch 'upstream/master' into ovx