Feanil/ansible xserver

Rebased from latest again.