Support scaling up for masters and nodes (#598)

* Support scaling up for masters and nodes

* Simplify scaleup code

* Add sanity checks before upscaling