Merging work for xfrm-34 from wluyima/master into openmrs-module-xforms/master