Merge pull request #510 from mtconnect/509_issues_with_2.4_shdr_token… #422

Job	Run time
MacOS Latest, Shared: True	31m 8s
Ubuntu Latest, Shared: True	25m 18s
Windows 2019 Arch: x86, Shared: False	40m 40s
MacOS Latest, Shared: False	28m 55s
Ubuntu Latest, Shared: False	25m 30s
Windows 2019 Arch: amd64, Shared: True	50m 53s
Windows 2019 Arch: amd64, Shared: False	47m 38s
	4h 10m 2s

Provide feedback