Merge pull request #1906 from jeffreythomas/dev

[BACKLOG-321] - Backing out changes until a better fix that does not inv...
[BACKLOG-35] - Create JavaDoc Template for the OEM Documentation

Update to fix some xml blocks in Mindtouch.