[irods/irods#1985] Added Xmsg unit test
[irods/irods#1985] fixed merge conflict