Jarv/xserver updates

@feanil @carsongee @jrbl - not sure who is using the ansible xserver role, this is a small cleanup.