Fix for 20194, and partial fix for 20196. QL Passed

git-svn-id: https://svn.java.net/svn/glassfish~svn/trunk/main@61217 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5
Add root BDA. http://java.net/jira/browse/GLASSFISH-19944

git-svn-id: https://svn.java.net/svn/glassfish~svn/trunk/main@61218 6f3ba3e3-413c-0410-a8aa-90bee3ab43b5