Merge "Update documentation regarding retry/timeout configuration in dmaap-client."