More changes

Ensure this is compatible with Python 2.6. Reported by ALan Jay.
Handle restart -> retry change in v_b_e as well. Reported by Martin Boer.
Add support for storage -> storage_hint.  Handle .healthy change
correctly.