RavenDB-2957 Merge database & file systems views
Merge pull request #1646 from ml054/RavenDB_2957

RavenDB-2957 Merge database & file systems views