Merge proposals dependent on lp:~litlfred/openhie-pr/trunk

lp:~litlfred/openhie-pr/trunk has no merge proposals.