New NFL CBA would eliminate suspensions for positive drug tests, marijuana included