FS-28: Fixed the tests to work with the virtualstream.
Merge branch 'FS-28_Concurrency' of https://github.com/Fides-Storage/Server into FS-28_Concurrency

Conflicts:
	src/main/java/org/fides/server/ClientFileConnector.java
	src/main/java/org/fides/server/files/FileManager.java
Merge branch 'FS-28_Concurrency' of https://github.com/Fides-Storage/Server into FS-28_Concurrency