cherry-pick 9d32621

regressions introduced by 53f5f9c
* 3c5b61a fix only wrong state

This commit fixes state *and* lastCheck - updateStateAndLastCheck hits
mongo to read check