Fix marshaling issue by not sending server implementation class across
the wire.
Merge branch 'sitewhere-0.9.7' into sitewhere-1.0.0