CP-6958 - Fix 64-bit build, original commit by Jon Ludlum
CP-6958 - Fix vncterm path for 64bit.
Merge commit '7f0f67c9ee3c62ff4a625b2bbde5df53143fe053'
Merge commit '2ac377e51189419f6f35f1f5a29c6556cfd99acd'
Merge commit '79f3ffe66f4676fe14bec57c24723ef9e5339045'
Merge commit '0c667955fea4a1bad8589c9a2dbe0c133f33ce9a'
Merge commit 'ee97c2e73fe4c22a99724190a5a73f2e845d3af5'
Merge commit 'a61fced3b19e14f06dcb9e1bd7cb976d4d7e018f'
Merge commit '3dbdd52d522249e4e5b222e5d02466cc875a4279'
Merge commit '6cba88947a374e7649e79ed20114f9a65bf5a962'
Merge commit '4d23d5e97121c10a5b2b90ee6dc4d5615afb0dd3'
Merge commit 'cf732f334989b157ef79bfb3913a0df9dcce65b1'
Merge commit '73ef34c78d00745d8d42e6d16341a9b14870e06a'
Merge commit '80095466304ecd12f8afff762ae1200be866eb7a'
Merge commit '8f6e7cc53853dbf9ee4624027a777324d753fc28'
Merge commit '820b5d806963583559636a18c84b5d7c0ad83b8b'
Merge commit 'ce6d3f276f0a56ef57ebcf10f45b0f478fd70322'
Merge commit '0037a37eeb5df12a60efef9b32da56d016c2c953'
Merge commit 'a365545c3b113fcd4bedecbc9146d4b6e3efbb04'
Merge commit 'fa2f1efa4d18b5965098d79ab3c87d03ca5e7d65'