Remove whitespace from the beginning and end of individual lines in a <command> tag before assembling it into a single line.
Patch from Eric Rasche, redacting a few things from sentry reports.
Create the tool_data_table_conf.xml file if it doesn't exist
Merge with upstream changes.
Merge.