ENG-5741: sysinformation fixes and metadata changes.