deprecate userdom_xwindows_client_template
    
    The X policy for users is currently split between
    userdom_xwindows_client_template() and xserver_role().  Deprecate
    the former and put the rules into the latter.
    
    For preserving restricted X roles (xguest), divide the rules
    into xserver_restricted_role() and xserver_role().