[PATCH][master][RHEL] move Xorg test up so we might start vnc instead