enable admin to change the recovery password
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption