Merge "Allow FWaaS API test to accept more than one end state"