CDB-3980 Fixed for public_map and tables
CDB-3980 Fixed for public dashboard, datasets and sitemap
CDB-3980 proper sitemap logic (no /u/user)
Merge branch 'master' into CDB-3980
Merge pull request #752 from CartoDB/CDB-3980

Cdb 3980