[MNG-3221] Reverted previous two attempts at fixing this issue, and using this one instead, which applies the same removal logic for report mojos that are in the forking-mojos stack as are applied to normal mojos. All tests pass here.