SOme tweaks to new usertracking file. Revert system.xml to older commit to get rid of whitespace edits by netbeans
Re-edit system.xml, placing back new code after whitespace edits were reverted