OS-2479 the ramdisk must grow to accommodate gdamore's locales
OS-2474: If we get an error trying to create the zone socket, back-off and retry a few seconds later.
Merge branch 'master' of git://github.com/joyent/smartos-live into ec