Fix upstream rspec failure in cinder

- This is a fix to code that made it into master which was causing
  jenkins to fail

Change-Id: Ic5373aa552e20c83dfc03464544f3f8339be0e24
Merge remote-tracking branch 'upstream/master' into icehouse