OS-2554 remove temporary work around for bug in rename() events as underlying issue has been fixed now.
NET-181: If admin_ip and admin_netmask are set in bootparams, don't use DHCP
OS-1244 vfsstat output is confusing
OS-2490 'imgadm update' should ensure imported images' snapshot is named '@final'
OS-1999 imgadm update on already installed image should re-fetch manifest for mutable field changes
OS-2520 add archive_on_delete option for VMs so that we can keep zone data around for debugging.
OS-2541 ignore failed VMs that are also stopped when checking for duplicate IP/MAC/VRID
OS-2565 add some additional debugging to try to help track down 'Could not find VM...' errors.
OS-2530 fix so deleting 2nd NIC of 3 on a KVM VM will no longer render the VM unbootable
OS-2572 set hires_tick=1, or hz=1000
OS-2552 add node-lockfd (v0.0.2) to platform
OS-2558 smartos-live should run tools from proto.strap, not proto
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
TOOLS-292 enhanced metadata client tools
OS-2573 metadata agent support for PUT, DELETE and V2 protocol
OS-2573 metadata agent support for PUT, DELETE and V2 protocol (fix manifest)
OS-2593 upgrade node-lockfd (v0.0.3) in platform
OS-2594 upgrade v8plus (0.1.3) in node-lockfd in platform
OS-2547 VM.js should protect writes to configuration files with a lockfile
Reviewed by: Josh Wilsdon <jwilsdon@joyent.com>
OS-2449 diskinfo should provide physical location and logical path
OS-2550 'imgadm create -s prepare-image-script' safe image creation

This is imgadm version 2.5.0.
OS-2600 error with NotSupported for attempt to create an incr image of an incr image

Also fix VM.js 'make check' error.
FWAPI-28: Add description field for rules

FWAPI-97: Add created_by field for rules