fix merge conflicts
add a flag for config_drive_format, default to iso9660
Merge pull request #385 from rackerjoe/v4.1.5rc

Merged automatically by jenkins after successful build test