master to future merge

Another iteration of it. Big clashes happened in the Calo packages due to the collision of the move to functional done long ago on future and the move to new properties + adaptation to newer Gaudi done recently on master. To be avoided in the future