US5977 fix failing ATs
Merge branch 'us5977' of github.com:inbloomdev/datastore into us5977