Added smf stop that does not error on already stopped vm's
Merge branch 'test' into dev