Delay thrift calls until node startup
Merge branch 'master' into python-driver