org-e-odt.el: Merge category strings and short caption changes