Ok, here is trial number 2, with patch and test files. The test file
shows multiple use cases.

Just let me know if something in this still needs fixing.

Jarmo

PS. org-combine-plists is a cool function
PPS. I just amended the commit of my first trial, that's why the
     timestamp is still from this morning.