The issue has been fixed in the code. However, we don't have a release vehicle to ship the fix and will be available by the end of June.
We have enhanced the Tivoli support, to include templates, so you can better control the contents of the file that is created.