Updates 2.0.4 issue 225#226

IainCRobertson merged 2 commits intoupdates-2.0.4riscv-non-isa/riscv-trace-spec:updates-2.0.4from

updates-2.0.4-Issue-225riscv-non-isa/riscv-trace-spec:updates-2.0.4-Issue-225Copy head branch name to clipboard