joyent/smartos-live#233: `logadm` errors
STOR-87 upgrading across STOR-84 requires dump device reinitialization
OS-2635 move /var/log/{fw,vm} logs to name that includes timestamp and nodename
FWAPI-107: Be more explicit about which rules affect all VMs
joyent/smartos-overlay#1 silence output from zpool existence test
Merge branch 'joyent_20140403' into updates_from_joyent

Conflicts:
	lib/svc/method/fs-joyent
Merge branch 'updates_from_joyent'