PLFM-2055: clean up EvaluationManager update code
Merge pull request #574 from bkng/develop

PLFM-2055: clean up EvaluationManager update code