Abort wait for 404 if the status changes to ERROR

This patch enhances the NotFound/404 waiter to not continue to wait
for a 404 if the zone goes into status ERROR.

Change-Id: I27d5d654b2b2b2b4cd8b8e85fdb1d7b1e4162516
2 files changed