[rackspace|block_storage] fixing merge issue