also skip bundle and euca

these exercises don't work on many versions of boto, stop using
them by default in grenade.

Change-Id: Idca068b0f062c31963d7c32d88f5721343b5c0cd
do xtrace in include scripts correctly

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