Move elasticity patches into a fork

Also, remove default availability zone settings.