[US5975] whitespace cleanup
Merge branch 'us5975' of github.com:inbloomdev/datastore into us5975