Handle nested xtrace states

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
remove version from sc

Change-Id: Iea4bd138bd3b71b83b712e5030ea7eae29707196
Merge branch 'identity-v3' into dt-test
Merge branch 'stack-user' into dt-test