The current cfg cleanup_on_error is a bit of a misnomer, since cleanup
is not always dependent on there being an error.
This commit updates the cleanup cfg parameter to better reflect when
cleanup actually happens - cleanup_on_exit
Change-Id: I984e4b660705be8afa50a1e8605102832fd802dd