Change to curator 2.x timeout syntax and allow for upgrades