Fix DevStack xtrace output

This ensures xtrace is correctly restored, allowing us to see the commands
executed during, for example, exercise runs.

Change-Id: I49434ae752a6c214892634a3dfa9f24b814ebd59