New “kill” behavior seems inconsistent with State Model for Feedhold and Job Kill (and bad location on hold)

[tedh-shopbot]

In builds from edge (101.03), a hold in a move that is followed by a kill terminates in stat:4 (END)

g2: <-S-1602602534638----- {"sr":{"posx":2.76753}} [g2]
debug: Sending a feedhold [g2]
g2: --S-1602602534819----> ! [g2]
g2: <-S-1602602534890-----
    {"sr":{"posx":3.25121,"vel":79.74,"stat":6,"hold":4}} [g2]
info: Got a machine state change: paused [machine]
g2: <-S-1602602535139----- {"sr":{"posx":3.29141,"vel":0,"hold":0}} [g2]
debug: ===>Sending Cleanup KILL [g2]
g2: --S-1602602536200----> \x04 [g2]
g2: <-S-1602602536203----- {"er":{"fb":101.03,"st":207,"msg":"Kill job – Job
    killed by ^d"}} [g2]
error: {"er":{"fb":101.03,"st":207,"msg":"Kill job - Job killed by ^d"}} [g2]
g2: <-S-1602602536205----- {"sr":{"stat":5}} [g2]
info: Got a machine state change: running [machine]
g2: <-S-1602602536235----- {"sr":{"stat":4}} [g2]

Now, in builds from edge-preview (101.06), a hold in a move that is followed by a kill terminates in stat:3 (STOP) (note the incorrect initial position report for X ...Ln4)

g2: <-S-1602605814670----- {"sr":{"posx":3.31179}} [g2]
debug: Sending a feedhold [g2]
g2: --S-1602605814689----> ! [g2]
g2: <-S-1602605814856----- {"sr":{"posx":4.65528,"vel":0,"stat":6}} [g2]
info: Got a machine state change: paused [machine]
debug: ===>Sending Cleanup KILL [g2]
g2: --S-1602605816912----> \x04 [g2]
g2: <-S-1602605816916----- {"er":{"fb":101.06,"st":207,"msg":"Kill job - Job killed by ^d"}} [g2]
error: Response with an exception report: [g2]
error: {"er":{"fb":101.06,"st":207,"msg":"Kill job - Job killed by ^d"}} [g2]
g2: <-S-1602605816918----- {"sr":{"posx":3.51768,"stat":5}} [g2]
info: Got a machine state change: running [machine]
g2: <-S-1602605816948----- {"sr":{"stat":3}} [g2]