Merge change 20200 into donut

* changes:
  Fix NPE that prevented any package w/o license to be installed.