- Fix for GLASSFISH-20255, tested against the original test case application
- fixed reproducer for GLASSFISH-16199 (the use case is no longer valid and caused deployment error)

Change-Id: I08fcde445f0fee5118e83c1dcfabea220a5086d1