[refactor-contentdiv1] make sure that --abort and --stop works when relocation of "divergent" in play while resolving content-divergence