Merge proposals dependent on lp:~zulcss/cinder/grizzly-ftbfs

lp:~zulcss/cinder/grizzly-ftbfs has no merge proposals.