Merge "Add cinder volume instancelocality filter test" into mcp/caracal