Merge "Split out datastore implementation from aaa-shiro"