the included upgrade scripts were turning off xtrace, not
restoring it like we should have been doing. This makes debugging
many of the upgrade issues very difficult.
fix this with the standard xtrace restore.
Change-Id: I922d139b83644a2584c46fecb51b346b05feeec8
c6a3491452