(#16570) Don't load the node object again in configurer

Avoid loading the node object again if we already have a catalog.

In the long run the configurer class should probably be rafactored to have separate methods for fetching a catalog and applying it (and possibly have fetching of catalogs elsewhere).

Not methods like this:

    # Retrieve (optionally) and apply a catalog. If a catalog is passed in
    # the options, then apply that one, otherwise retrieve it.
    def apply_catalog(catalog, options)