All in-use unit tests now passing after merge

apps/files_encryption/hooks/hooks.php

apps/files_encryption/lib/crypt.php

apps/files_encryption/lib/keymanager.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/lib/stream.php

apps/files_encryption/test/binary

apps/files_encryption/test/crypt.php

apps/files_encryption/test/keymanager.php

apps/files_encryption/test/legacy-encrypted-text.txt

apps/files_encryption/test/proxy.php

apps/files_encryption/test/stream.php

apps/files_encryption/test/util.php

apps/files_encryption/test/zeros

apps/files_encryption/tests/stream.php