To get around the issues in ISPN-1161, programmatic and XML configuration methods were separated.

The solution used generated issues with the config generation as shown in https://github.com/infinispan/infinispan/pull/402#issuecomment-1483390

The latest solution has in turn resulted in a regression in https://infinispan.ci.cloudbees.com/job/Infinispan-master-JDK6-tcp/96/#showFailuresLink for XmlFileParsingTest/org_infinispan_config_parsing_XmlFileParsingTest_testConfigurationMergingJaxb

So, provide a solution that solves both tests and works w/ configuration doc generation.