Regenerate jeoses

Jeos regeneration - Also make changes to generate-citrix-job.sh

setup type needs to be specified with -t