Fix intellidemand import conflicts and adapt to condor