Imperfectly convergent config sync can result in pathological config sync ping-pong

It appears that our conflict resolution as part of config sync is not perfectly convergent. We have seen cases where nodes can ping-pong on conflicting changes to the config.