Settings to control traces.

Also some re-organization of the debug options, and check for
the case where the global debug setting is turned off but there
are some debug options turned on (in which case we just switch
to the global option being on).

Change-Id: I710e3a009e2be9c7c1a1879a853ac736abf1d8d8