CDB-3100 Organization ensures name does not exist as username either
Merge branch 'CDB-2891' of https://github.com/CartoDB/cartodb into CDB-2891