CDB-2805 fixed flow for non-oauth links
Merge branch 'master' of https://github.com/CartoDB/cartodb into CDB-2805