Fixes to the xqueue and xserver roles.
Merge pull request #358 from edx/feanil/xqueue_xserver_fixes

Fixes to the xqueue and xserver roles.