Consolidate OME-XML primitive type logging (rebased onto dev_4_4)

Same as gh-537, rebased onto dev_4_4.