[BACKLOG-194] - Pull changes to FileResource and the work done in BACKLOG-194 into master.
Merge pull request #1795 from brendan-lynch/oemdoc-file

[BACKLOG-194] - Pull changes to FileResource and the work done in BACKLO...