SAPI-254: try to make at least restoring the real sapi service more reliable on test failure
SAPI-254: try to make at least restoring the real sapi service more reliable on test failure

joyent/sdc-sapi,joyent/sdc-sapi