Added a unit test for testing onError call of parent observable being
delayed.
Replacing deprecated OnSubscribeFunc in unit test with OnSubscribe.
Merge remote-tracking branch
'mruehle/mergeDelayErrorNotDelayingParentOnError' into
mergeDelayErrorFix

Conflicts:
	rxjava-core/src/test/java/rx/operators/OperationMergeDelayErrorTest.java