Trashbin for encryption keys now against master

@schiesbn the changes should go to the master and not to the stable5, after merge we can merge the master to files_encryption branch so development will be easier.
@LukasReschke this should hopefully be ok now?