Manually merged
Merge branch 'ihe-pix-xds-profile' of https://github.com/jembi/openhim.git into ihe-pix-xds-profile