Update to account for new system image location

And reformat for legibility
Merge pull request #5875 from tkelman/patch-1

Update to account for new system image location