Copy r5088 & 5089 into 1_2_90 tag

git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc@5092 3789f03b-4d11-0410-bbf8-ca57d06f2519
revert r5092, should have been applied to 1_3 branch

git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc@5093 3789f03b-4d11-0410-bbf8-ca57d06f2519
copy r5088 & 5089 to 1_3 branch

git-svn-id: https://tigervnc.svn.sourceforge.net/svnroot/tigervnc@5094 3789f03b-4d11-0410-bbf8-ca57d06f2519