Merge "Cinder fix" into stable/brahmaputra
authorMark Beierl <mark.beierl@emc.com>
Tue, 5 Apr 2016 13:39:14 +0000 (13:39 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 5 Apr 2016 13:39:14 +0000 (13:39 +0000)

Trivial merge