CDB-1614 Fixed remaining failing spec
Merge branch 'privacy-maps' of https://github.com/CartoDB/cartodb into privacy-maps