Fix top level pom inclusion in src zip
Improve encapsulation of code in ServerRequestInfoImpl
Add DII test
BZ974 Escape parameter argument if it clashes with an enclosing module