Change in vdsm[master]: beautify and better __exit__ strategy