Merged patched from Alex Miller: 1) Improve aveserver failure handling 2) Write prope...