Merge "Add compare header version to create_image_from_server helper"