ModuleHelper - fix bug when adjusting conflicting output (#5755) * ModuleHelper - fix bug when adjusting conflicting output * add changelog fragment * remove commented test code (cherry picked from commit b49bf081f8) Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
b49bf081f8