Fix of #SPC-756. And removed updateCriteria. Criteria now knows if it is dirty or not.
Merge branch 'space/13.2' of github.com:OpenNMS/opennms into space/13.2