Merge pull request #1883 from krivera-pentaho/oemdoc-dev

[BACKLOG-197] -- added unit tests for SystemUsersResource
[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
[BACKLOG-197] -- added unit tests for UserRoleListResource