KFSTI-699 Change hardcoded valuesfinder to an enum
Merge branch 'kfsti-668' of https://github.com/bhutchinson/kc into kfsti-668