Restore trackalyzer stuff; opt-in within on_saltstack conditional