Merge "Cinder fix"
authorMark Beierl <mark.beierl@emc.com>
Wed, 9 Mar 2016 14:55:49 +0000 (14:55 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 9 Mar 2016 14:55:49 +0000 (14:55 +0000)

Trivial merge