Fix merging of multi-line fields

Merging two multi-line fields (such as "Description") failed with ValueError: value must not have blank lines if the right-hand side of the merge had more than one non-trivial line.