Merge change 2042 into donut

* changes:
  Remove deprecated openInputStream factory method