UI-3137  Fix UI bugs on gatein 3.7.x after upgrade