Yeah I am having the same problem with the Combat Dummies. I can get my companion to stop attacking but it won't take me out of combat. /Stuck relocates me but still in combat. I finally had to suicide by running off the balcony by the Throne room to get it to stop.
How many years now and the best way to solve a problem in game is Suicide. Well I won't ever touch a combat dummy again because then I'm the CoMBat DuMMy.