[xorg-x11-server/f21] upstream release 1.16.3 + two backport fixes