The lib/database abstraction includes the appropriate database file that also
contains the $XTRACE bits at entry and exit. The nested XTRACE handling overwrote
the value from lib/database. So...make the nested files use their own
XTRACE variables.
Change-Id: Ibdfc8d7d1e1457a9bc889b781ce176b417789ea1