Improve treatment of condor_enabled / hadoop_enabled.