Avoid backend termination (v2)

https://github.com/CartoDB/cartodb/pull/273 was outdated and required conflict resolution. 

Leaving this PR for when there is time to deep test User changes and merge it.