[WFCORE-205] Use a sorted map for storing the client content
Merge pull request #273 from bstansberry/WFCORE-205

[WFCORE-205] Use a sorted map for storing the client content