Adapt server lists to be more easily used by salt-cloud