OS-2925: 'imgadm update' should include disabled images
OS-2927 too many VMs causes async.eachSeries to recurse too deep for node 0.10, switch to async.each (parallel) instead.
OS-2930 update async.js to 931d15412c5081e35f96dee3cc7a98d8322e7b17 which removes warnings in node 0.10
FWAPI-160 firewaller refusing to start with "TypeError: Property '_setOldIPF' of object #<Object> is not a function"
OS-2955 /usr/vm/sbin/zoneevent should exit on SIGPIPE
OS-2956 VM.reboot should cleanup zoneevent watcher on error
OS-2958 first src/img 'make update_modules' for recent npm and update
IMGAPI-395: race in IMGAPI client 'getImageFile' and 'getImageIcon'
OS-2959 better imgadm create error handling for missing /etc/rc.local (/etc/rc.d/rc.local)
OS-2961 'imgadm import' breaks on missing 'tunnel-agent' dep
OS-2966 be more careful about fs.watch() in case /var/svc/provisioning moved before we started the watcher. (handle ENOENT)
OS-2961 forgotten manifest update for new files
OS-2958 missing manifest update for this
OS-2004 switch all VM tests to nodeunit (remove support for node-tap)
OS-2970 failing VM tests should generate cores
OS-2004 switch all VM tests to nodeunit (remove support for node-tap) -- added missing Makefile change
Merge branch 'master' into OS-2814

Conflicts:
	src/vm/tests/test-defaults.js