Simplify mapping from mlab node fdqn to mlab sliver fqdn
MasterSrv: Update available servers

I needed to tweak the name of Bogota` in airports.json, because
there were UNICODE issues.
MasterSrv/redir_table.sh: regen
Merge branch 'update_master_server' into stable
Merge branch 'stable'