Bring trunk upto date with 3.10 changes.

Mostly related to moving all web client interactions via a single intrerface and moving some functions out of calsvc into that client.

A few files committed as partof moving to use intellij