Merge pull request #1873 from eeshangarg/starter-project-1870

Refs #1870 - replace six.u with the u prefix in tests/hazmat/primitives