CLDINT-1040 cleanup
CLDINT-1051 increased timeout from 5 to 10s; increased attempts maximum for provider errors from 3 to 5