Merge "updating deployment configs to use new dictionaries for src/dst hosts"