X11 fowarding - handle DISPLAY if screen number not present.

X11 forwarding doesn't care about the screen number, so handle DISPLAY
environment variables without that present correctly.

E.g., both "localhost:10.0" and "localhost:10" are now handled, whereas
previously only the first form would have been accepted.

Bug 6532.