Merge pull request #1620 from clebertsuconic/2.3.eap6_2

Triage things out https://bugzilla.redhat.com/show_bug.cgi?id=1084639