Resolve conflict between libuuid and ossp-uuid (DATASET-971). Backported from upstream trunk.
Merge branch 'joyent/feature/miscfix/2013Q3' into joyent/release/2013Q3