Merge pull request #2973 from markscott-ms/fix/2959-user-access-store-require-namespace