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
OS-2544: ipf rules from the GZ should be add to in-zone rules, not replace them
OS-2544: ipf rules from the GZ should be add to in-zone rules, not replace them (brand updates)
OS-2604 vmadm should catch EPIPE when stdout gets closed and exit gracefully.
OS-2605 amr too easily confused by Dell PCI SSPID reuse
HVM-781 always choose a new NIC to be primary when removing the current primary.