adjustments after uberfire merge
(cherry picked from commit 71171ce1e22bdae3f5a9d73c8956420b412f2e47)