Merge branch 'maint'

* maint:
  Bumped version nr
  ssl & public_key: Workaround that some certificates encode countryname as utf8 and close down gracefully if other ASN-1 errors occur.
  Add more cross reference links to ct docs
  Remove config option from common_test args
  Update user config to use nested tuple keys
  Allow mixed IPv4 and IPv6 addresses to sctp_bindx
  Add checks for in6addr_any and in6addr_loopback
  Fix SCTP multihoming
  observer: fix app file (Noticed-by: Motiejus Jakstys)
  Fix lib/src/test/ssh_basic_SUITE.erl to fix IPv6 option typos
  Prevent index from being corrupted if a nonexistent item is deleted
  Add tests showing that trying to delete non-existing object may corrupt the table index
  Fix Table Viewer search crash on new|changed|deleted rows
  Escape control characters in Table Viewer
  Fix Table Viewer crash after a 'Found' -> 'Not found' search sequence
  inet_drv.c: Set sockaddr lengths in inet_set_[f]address

Conflicts:
	erts/preloaded/ebin/prim_inet.beam

1 files changed, 14 insertions, 13 deletions

diff --git a/lib/test_server/src/ts_run.erl b/lib/test_server/src/ts_run.erl
index 5ce8e66660..4c87fcf8ae 100644
--- a/lib/test_server/src/ts_run.erl
+++ b/lib/test_server/src/ts_run.erl
@@ -332,9 +332,9 @@ path_separator() ->
     end.
 
 
-make_common_test_args(Args0, Options, _Vars) ->
+make_common_test_args(Args0, Options0, _Vars) ->
     Trace = 
-	case lists:keysearch(trace,1,Options) of
+	case lists:keysearch(trace,1,Options0) of
 	    {value,{trace,TI}} when is_tuple(TI); is_tuple(hd(TI)) ->
 		ok = file:write_file(?tracefile,io_lib:format("~p.~n",[TI])),
 		[{ct_trace,?tracefile}];
@@ -346,7 +346,7 @@ make_common_test_args(Args0, Options, _Vars) ->
 		[]
 	end,
     Cover = 
-	case lists:keysearch(cover,1,Options) of
+	case lists:keysearch(cover,1,Options0) of
 	    {value,{cover, App, none, _Analyse}} ->
 		io:format("No cover file found for ~p~n",[App]),
 		[];
@@ -356,7 +356,7 @@ make_common_test_args(Args0, Options, _Vars) ->
 		[]
 	end,
 
-    Logdir = case lists:keysearch(logdir, 1, Options) of
+    Logdir = case lists:keysearch(logdir, 1, Options0) of
 		  {value,{logdir, _}} ->
 		      [];
 		  false ->
@@ -371,15 +371,16 @@ make_common_test_args(Args0, Options, _Vars) ->
 			{scale_timetraps, true}]
 	       end,
 
-    ConfigPath = case {os:getenv("TEST_CONFIG_PATH"),
-		       lists:keysearch(config, 1, Options)} of
-		     {false,{value, {config, Path}}} ->
-			 Path;
-		     {false,false} ->
-			 "../test_server";
-		     {Path,_} ->
-			 Path
-		 end,
+    {ConfigPath,
+     Options} = case {os:getenv("TEST_CONFIG_PATH"),
+		      lists:keysearch(config, 1, Options0)} of
+		    {_,{value, {config, Path}}} ->
+			{Path,lists:keydelete(config, 1, Options0)};
+		    {false,false} ->
+			{"../test_server",Options0};
+		    {Path,_} ->
+			{Path,Options0}
+		end,
     ConfigFiles = [{config,[filename:join(ConfigPath,File)
 			    || File <- get_config_files()]}],
     io_lib:format("~100000p",[Args0++Trace++Cover++Logdir++