CDB-1991 some fixes for branch stabilization
CDB-1991 All specs stabilized to support UUIDs except geocoding ones
Merge branch 'master' of https://github.com/CartoDB/cartodb