CLC-1220 Improvements in how we mark server as offline/online; add upgrade routine to init.d script
CLC-1220 Do all our sleeping in start-trinidad.sh instead of in deploy.rb
Merge pull request #670 from ctweney/clc-1220-initd-qa

CLC-1220 tweaks to startup scripts, qa branch version