Fixed cartodb avatar load test
Merge branch 'master' of https://github.com/CartoDB/cartodb into CDB-3501