Fixed DataServer shutdown problems and DataServer persistence; Web Server can now restore column state