Merge changes I034a9f0a,Iad5ec577 into pi-dev

* changes:
  Get rid of UserPackageWrapper util.
  Get rid of extra whitespace under divider lines