Stateserver merge-in

We want to merge the existing (unbroken, test-satisfying) state-server code in to the main branch so that it is less likely to be stepped on in another code branches.   Work on the StateServer will continue to happen in the existing stateserver branch.