Merge "Fix ContentWrapperTest#testAccessDatabase" into jb-dev