[IN_PROGRESS] [JENKINS-20734] NPE on some operations after restart

Solves the problem, but still need to migrate data and update the cloud name whenever it changes.