Merge "Use base.create_image_from_server to create server snapshot"