- moved expand_all_variables_in_org_files out last inside
  set_customer_specific_variables, as it was before.