Fix issue with snapshot name on error

In patching tests, when error happens
identical snapshot names was used in case
of error, so we can not revert all errored envs.

Change-Id: I0d8bde7989f4bacaec728759b060bd53f9f17cf7
Merge "Fix issue with snapshot name on error"