FWAPI-53: "too few args to sprintf" error when adding remote VMs with a UUID matching a local VM
OS-2260 fix regression caused by OS-2059 which broke 'make check' on a clean checkout on OS X.
Merge branch 'master' of git://github.com/joyent/smartos-live into ec