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

Avoid loading the node object again if we already have a catalog.
Merge branch 'pr/2162'

* pr/2162:
  (#16570) Don't load the node object again in configurer

Conflicts:
	lib/puppet/configurer.rb

Closes GH-2162