fix(cmd-api-server): shutdown hook was not waiting for promises

fix(cmd-api-server): shutdown hook was not waiting for promises #2689