Merge IP Addresses of Clients

[daknob]

The initial design of eldim included a separate list for IPv4 and for IPv6 addresses per client. This is not really needed anywhere, and instead adds complexity to the code that isn't necessary.

This bug tracks the removal of this, and the replacement by a single list, that contains both IPv6 and IPv4 addresses.

NOTE: This requires changing the configuration file format, so appropriate warnings must be added