[rackspace|block_storage] fixing merge issue
Merge pull request #2290 from rackspace/merge_fix

[rackspace|block_storage] fixing merge issue