As per CLI and GUI, availability_zone is not mandatory. In templates, it is. This is incorrect. This patch corrects behaviour to match CLI and GUI. Change-Id: Ice37340f084ea65bd4b46562145e82ede6bc0df5 Story: 2006586 (cherry picked from commit 2799a5fcd76639a202092ea1b6fc242a8886dc56)changes/93/683193/4