Fixed an issue where a save in a child context could cause a merge to be cancelled, when it is only really necessary is the save is into the persistent store.