RavenDB-2957 Merge database & file systems views