Updating build_asf from the 4.1 branch, where I fixed a couple of things