[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1447: Brought staxwax into dhis2-service-xml with some enhancements