Merge pull request #15445 from owncloud/enc2_migration

apps/encryption/appinfo/app.php

apps/encryption/appinfo/application.php

apps/encryption/appinfo/info.xml

apps/encryption/appinfo/register_command.php

apps/encryption/appinfo/version

apps/encryption/command/migratekeys.php

apps/encryption/hooks/userhooks.php

apps/encryption/lib/crypto/crypt.php

apps/encryption/lib/keymanager.php

apps/encryption/lib/migration.php

apps/encryption/tests/lib/KeyManagerTest.php

apps/encryption/tests/lib/MigrationTest.php

lib/base.php

lib/private/encryption/keys/storage.php

lib/private/encryption/manager.php

lib/private/encryption/util.php

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

lib/private/files/stream/encryption.php

lib/private/server.php

settings/admin.php