LIVEOAK-407: Move around location of system level resources and updated tests.
Merge pull request #365 from mwringe/LIVEOAK-407

LIVEOAK-407