Backport updates to GetCapabilities generation
Merge pull request #251 from smithkm/xmlbuilder-1.5

Backport updates to GetCapabilities generation