Issue #3539501 by danrod, tanushree gupta, mstrelan, bramdriesen: Remove duplicate GenericTest in system.module (cherry picked from commit b10ea512)