merge conflicts
Fix merge error.
add missing options from the cd9660 filesystem.
import current am-utils.