Manual merge of retryWhen/repeatWhen

Manual merge and rebase of https://github.com/Netflix/RxJava/pull/1470