UF-131: adapted to last UberFire changes (improvements on dependencies)