0005641: Fatal Error after activating oxskipdiscounts always return oxList object as method promises (cherry picked from commit 2532485)
Removing unnecessary code (cherry picked from commit 1f7ec24)
Fixing failing integration tests (cherry picked from commit 7d3e36b)