More adjustments to not rely on a non-existing dict and use the list instead
More adjustments to not rely on a non-existing dict and use the list instead

pombredanne/mirrormanager2,pombredanne/mirrormanager2,pombredanne/mirrormanager2,pombredanne/mirrormanager2