CDB-3460 Disabling some tests until are fixed so we can be more confident on CI results
Merge branch 'master' of https://github.com/CartoDB/cartodb into CDB-3460
Merge branch 'CDB-3460' of https://github.com/CartoDB/cartodb into CDB-3350