Merge "Remove deprecated recoverable keystore classes." into pi-dev