[BACKLOG-1142] REST services clean up from 5.2
Merge pull request #578 from e-cuellar/oem-rollback

[BACKLOG-1142] REST services clean up from 5.2