OS-2011 make vmadm more helpful when you pass in invalid JSON.
Merge branch 'master' of git://github.com/joyent/smartos-live into ip6