[CLEANUP] Additional Changes from the OEM Documentation Rest endpoint epic.
Merge pull request #1891 from brendan-lynch/master

[CLEANUP] Additional Changes from the OEM Documentation Rest endpoint ep...