Change-Id: Ib23e081301e4f7544558410c1e9660547149c03a
This reduces the number of smoke tests to < 10. It includes v1 tests, v2 tests and one scenario test to check that a zone goes to active. Change-Id: I9233a5d783649fe2bfad8e772f4165bdc4e1c619
Change-Id: I86cdf2b62f3586d35652891e4ace70ff8548640b