SmartOS/live bd494f1. sample.configure.smartos, overlay/generic/etc driver_aliases

Merge branch 'master' into vminfod
DeltaFile
+28-16overlay/generic/lib/svc/method/fs-joyent
+6-6sample.configure.smartos
+4-4src/dockerinit/src/docker-common.c
+1-1overlay/generic/etc/driver_aliases
+1-1src/dockerinit/json-nvlist/json-nvlist.c
+40-285 files

UnifiedSplitRaw