CDB-3098 Changed some hardcoded 'public' for user schemas
Merge branch 'CDB-2891' of https://github.com/CartoDB/cartodb into CDB-2891