Backport two fixes for 1.33.0 * history file storing * traceroute command option parsing Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi> (cherry picked from commit c1f3c52564fdec85394e7c338f56df0943ce8b10)