Merge "add create_image_from_server to base class for auto cleanup"