Fix customer relationships that were wrong.
issue #20044: Tweak so to one relationships have the non-nested version too.