Depends-On: https://review.openstack.org/567779 Needed-By: https://review.openstack.org/568174 Change-Id: If5bdd602d5f5c8addba70235ac41c0a52cef2c11
Also bumps the test timeout up as it sometimes fails now due to too many tests. TrivialFix Change-Id: If486a21cb800bd504dcd011aae74113568d0d026