Merge "Restore test user's original roles during clean up"