fixes vizzuality/cartodb-management#3002
fixes vizzuality/cartodb-management#3039
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop