Merge Bug

Working on https://github.com/Netflix/RxJava/issues/1420

In testing on prod this looks like it may solve it .... running longer term tests to confirm.