Fixed database_username function
Merge branch '2.0' of github.com:CartoDB/cartodb20 into 2.0