Merge "Allow _status_timeout to be used for non-nova polling"