fix token field list to sync with criteria state
Merge branch 'space/13.2' of github.com:OpenNMS/opennms into space/13.2