Merge pull request #1801 from mdamour1976/oemdoc

[BACKLOG-195] Removing BlockoutResource - moving other methods to util