adapted to most recent uberfire updates (performance focused)
adapted to recent changes of uf use of system.git (a branch per user data)