CA-135194: use better names for XenStore watch tokens

helps debugging