Merge "Use addClassResourceCleanup for cleanup in identity users test"