(PUP-3174) Make settings catalog skip manifestdir if environmentpath

This makes the settings catalog skip managment of manifestdir if
environmentpath is set.
(maint) Cleanup test to be more readable

The formatting was a little off, which made it hard to see what code was
in the test. This fixes the formatting and uses the resource matcher so
that it can provide a better error message.
Merge branch 'pr/3054' into stable

* pr/3054:
  (maint) Cleanup test to be more readable
  (PUP-3174) Make settings catalog skip manifestdir if environmentpath

Closes GH-3054