Groups merge dialog's tests
Merge branch 'develop' of github.com:CartoDB/cartodb20 into develop

* 'develop' of github.com:CartoDB/cartodb20:
  use Redis expire instead of pexpire to support CartoDB production environment