Merge "Revert "Revert "Changge bm_availability_zone to nova"""