Prepare descriptorParser jar for deployment

There are a number of fixes that should be applied before the generated jar for descriptorParser is ready for deployment. This ticket will be used to track those small changes.