Merge "remove --preserve-order option in tar fs image" into devel