Fix query to get table names from oids
Merge branch 'CDB-1260' of github.com:CartoDB/cartodb into CDB-1260
Merge remote-tracking branch 'origin/CDB-1260' into release/2.7.0