BZ-1164738 - EJB invocation issues thrown when working with the product

(cherry picked from commit 4c4f2c34fa7bc2e1c6178b2d6c77dda997a85302)