Ensure elists:insert/2 can be substituted with lists:merge/2
Use lists:keymerge/3 not a custom function

As the custom elists:insert/2 was used in only this one place,
the whole module which implements it is not needed anymore.
Fix mod_websockets:peername/1 return value
Fix mod_vcard_odbc wildcard search
Merge remote-tracking branch 'upstream/master' into arc-mod-mam-only
Made tls_drv permanent.