Fix/3.5.x/gtnportal 3247

This PR makes the backport from
- https://issues.jboss.org/browse/GTNPORTAL-3247
- https://issues.jboss.org/browse/GTNPORTAL-3253
- https://issues.jboss.org/browse/GTNPORTAL-3268