Rename "uri" to "pkcs11-uri"

The name "uri" was considered to be too generic and could potentially
clash with a future URI configuration option. Renamed to "pkcs11-uri".

Note that this option name was also preferred over "pkcs11uri", the
dash is considered to be the more clearer form.

lib/isccfg/kaspconf.c

@@ -780,7 +780,8 @@ cfg_keystore_fromconfig(const cfg_obj_t *config, isc_mem_t *mctx,
 		maps[i] = NULL;
 		dns_keystore_setdirectory(keystore,
 					  get_string(maps, "directory"));
-		dns_keystore_setpkcs11uri(keystore, get_string(maps, "uri"));
+		dns_keystore_setpkcs11uri(keystore,
+					  get_string(maps, "pkcs11-uri"));
 	}
 
 	/* Append it to the list for future lookups. */

lib/isccfg/namedconf.c

@@ -2601,10 +2601,11 @@ static cfg_type_t cfg_type_key = { "key",	  cfg_parse_named_map,
 /*%
  * A key-store statement.
  */
-static cfg_clausedef_t keystore_clauses[] = { { "directory", &cfg_type_astring,
-						0 },
-					      { "uri", &cfg_type_qstring, 0 },
-					      { NULL, NULL, 0 } };
+static cfg_clausedef_t keystore_clauses[] = {
+	{ "directory", &cfg_type_astring, 0 },
+	{ "pkcs11-uri", &cfg_type_qstring, 0 },
+	{ NULL, NULL, 0 }
+};
 
 static cfg_clausedef_t *keystore_clausesets[] = { keystore_clauses, NULL };
 static cfg_type_t cfg_type_keystoreopts = {