Fix Merge: backpressure + scalarValueQueue don't play nicely 

Manual merge of unit tests and fix by @dmgd for https://github.com/ReactiveX/RxJava/issues/1723 

Thank you @dmgd for debugging this as `merge` is very complicated code (unfortunately).