Ubuntu 7299-3: X.Org X Server Security Advisory Updates

USN-7299-2 caused a regression in X.Org X Server.