Updating keystorage movement and fixing hooks

apps/encryption/appinfo/encryption.php

apps/encryption/hooks/userhooks.php

apps/encryption/lib/crypto/Encryption.php

apps/encryption/lib/crypto/crypt.php

apps/encryption/lib/hookmanager.php

apps/encryption/lib/keymanager.php

apps/encryption/lib/migrator.php

apps/encryption/lib/recovery.php

apps/encryption/lib/users/setup.php

apps/encryption/lib/util.php

apps/encryption/settings/settings-admin.php

apps/encryption/tests/lib/KeyManagerTest.php

apps/encryption/tests/lib/MigratorTest.php

apps/files_encryption/lib/hooks.php

lib/private/server.php