Added uuid to pinfo directly (20).

Additionally, some unrelated changes to pn-viewer tool.
Merge origin/master