[sr-dev] git:master:eb5c1a41: presence: use separate structure to match presentity to replace or update