fix housekeeping code

- the master expiration timer was not really started
- integration issue with the finishStep

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
update unit tests

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
add failing test case for _masterDeactivated
Merge pull request #1443 from tardyp/housekeeping

fix housekeeping code