Manually merging with sv3 code

Most of the differences were related to the fact that aggregators are not already available on sv3.
The Backend differences were innocuous (spaces, indentation, and blank lines).
Config changes consists on email and log address.