Merge pull request #8662 from owncloud/f-lock

apps/files_encryption/hooks/hooks.php

apps/files_encryption/lib/proxy.php

apps/files_encryption/tests/stream.php

apps/files_encryption/tests/webdav.php

lib/private/connector/sabre/exception/filelocked.php

lib/private/connector/sabre/file.php

lib/private/files/filesystem.php

lib/private/files/lock.php

lib/private/files/storage/loader.php

lib/private/files/storage/wrapper/lockingwrapper.php

lib/private/helper.php

lib/private/log/owncloud.php

lib/private/util.php

lib/public/files/lock.php

lib/public/files/locknotacquiredexception.php

tests/lib/files/filesystem.php

tests/lib/files/mount/mount.php

tests/lib/util.php