Sweeping !1441 from master to devel: BookkeepingWatchAgent: re-doing the same

For #18 (closed)

BEGINRELEASENOTES

*TS FIX: re-doing the BK query with unchanged timestamp in case of errors

ENDRELEASENOTES

The logic is complex, I might have missed something. Please check with fresh eyes.