Feanil/ansible xserver

Rebased from on top of master.