[#858] cleanup
[#1985] Xmessage fix WIP
Merge branch 'master' of https://github.com/irods/irods