NXP-15591: replace 'h:outputText' with 'h:panelGroup' when needed