Chase xorg-server 1.17 update.

Use the bundled patch for this xorg-server version, and rename the old
local patch for it so it applies to this patch.

Reported by: olgeni@