Merge change 1998 into donut

* changes:
  Add inputSource to openInputStream Continuation of bug 1846343