[BACKLOG-195] Merge from oemdoc and minor code fixes
Merge pull request #1885 from bmorrise/oemdocdev

[BACKLOG-195] Merge from oemdoc and minor code fixes