Merge with default

src/basic_api.cc

@@ -204,7 +204,7 @@ JNIEXPORT void JNICALL Java_org_pEp_jniadapter_Engine_importKey(
 
     
     PEP_STATUS status = ::import_key(session(), _key, strlen(_key), NULL);
-    if (status != PEP_STATUS_OK) {
+    if (status != PEP_STATUS_OK && status != PEP_KEY_IMPORTED) {
         throw_pEp_Exception(env, status);
         return;
     }

src/gen_java_exceptions.ysl2

@@ -6,7 +6,7 @@ tstylesheet {
     template "/" {
         | package org.pEp.jniadapter;
         | 
-        | public class pEpException extends Exception {
+        | public class pEpException extends RuntimeException {
         |   public pEpException(String message) {
         |     super(message);
         |   }