refs #9257. Find and fix another bug.

Unit tests revealed two bugs in the updated merge logic. Tests now pass
again.