Merge "Move the default tokenStore service to aaa-h2 bundle"