usb-headnode wants amon fs.tar.bz2 to be relative to '/zones' (i.e.  start with 'root/...')
usb-headnode wants amon fs.tar.bz2 to be relative to '/zones' (i.e.  start with 'root/...')

Also change structure destined for /opt/smartdc/amon to be more like a
trimmed version of the dev tree. No *real* need to move master/... stuff
up to top-level dir. Lame? At least it means that scripts like
bin/amon-master don't have to differentiate.

joyent/sdc-amon,joyent/sdc-amon,joyent/sdc-amon,joyent/sdc-amon