6cae7e41ef
The security groups created in test needs to be cleanup after. In addition, refactor the image cleanup code. Change-Id: Ic088bc26bf786f2844d4fba5dbeca0a3256ad8a9