fix code that depended on the old JEOS structure and older Oz
Merge pull request #334 from redhat-imaging/bug/ec2_oz_updates

fix code that depended on the old JEOS structure and older Oz