gate-cinder-python27 gate-cinder-python34 is reporting failures where it
wasn't before. This is all due to new mock version 1.1.0. This patch
fixed the tests to pass the gate.
Some of these errors are actual errors in our test code, while other are
changes to Mock syntax.
Closes-Bug: #1473454
Change-Id: If8eabfeacacc221e92dfece9f4937875bd70751e