Adding initial commit of v0.9.11 bug fixes

Merging in changes for get_all_zones based bug fixes.