Also remove the scrape_timeout override.
This is discouraged by the prometheus_scrape lib,
and should no longer be necessary if the exporter has a cache.
We also need to use a newer build of the oci-image
that has the cache feature.
Change-Id: Ibac014171a084798ec1731553bbd896497d232a0
213a659f8d