Fixed issue #7290: Unable to mass delete tokens
Fixed issue #7212: Config parameter deletenonvalues not working