adding todo comment
CW-52 making create machine task atomic
CW-52 making delete/delete expired/bootstrap tasks atomic
Merge branch 'feature/cw-52' into develop
Merge branch 'eliranmal-develop'