Fix for Cobbler 1.6 token cleanup issue