Merge change 20808 into donut

* changes:
  BUG 2039245 : Need to show something in the source if there are no available package