Merge branch 'ticket/master/3669-make-puppet-honor-DNS-SRV-records'
- ticket/master/3669-make-puppet-honor-DNS-SRV-records: (#3669) Find servers via DNS SRV records Reset saved indirection state to an empty hash instead of nil after restoring Realign test/lib/puppettest.rb after the Great Indentation Change