Made some changes to ods_enforcer_count_starts()/stops() and ods_start_enforcer_timeshift(). This seems to fix some intermediate problems.
ods_enforcer_start_timeshift() did not take a timeout in develop
Merge pull request #53 from jelu/fix-keygen-test-dev

Port changes made in #50 / #51 to develop