Huge commit, but the previous commits have proven to be
harmless, so let's do it!

... and add a make target to execute it properly

fix captive portal prune sessions, radius still needs work, old code copied back but not sure if this works