Merge "zuul: Increase timeout for c9s-fips job"