Implement TISTUD-4323 Include ENV in diagnostic logs
  - ENV will show at end
  - Also cleaned up DiagnosticManager code.