#DS-917 updated ATs, definition only
Merge branch 'ds-917' of https://github.com/inbloomdev/datastore into ds-917
fixed pmd violation (no brackets for 'if')