US5995: Code review fixes.
Merge branch 'f314' of github.com:inbloomdev/datastore into f314