+ some cleanup in v3/p/common availability zones code. Change-Id: I8b5475e0e92ad3fbddc56ac1ee416146d0dfb2f7