Removed some uses of typename outside of template.
We were serializing the wrong kind of object.

This was causing a deserialization error.
fixing crash on missing key in sindex update
Merge branch 'v1.5.x' into sam_827
Merge branch 'v1.5.x' into sam_831