(maint) Fix a comment.
(PUP-1246) Update tests to show line numbers

The previous tests didn't check that the correct line number was being
reported. This updates the checks so that we can verify the line number.
Merge branch 'drednout-master'

* drednout-master:
  (PUP-1246) Update tests to show line numbers
  (PUP-1246) Fixed hiding error details in fileserver.conf parser

Closes GH-2185
Merge pull request #2177 from aperiodic/acceptance-docs

Add guide to running local acceptance tests.
Merge tag '3.4.1' into stable

3.4.1

* tag '3.4.1':
  (packaging) Update PUPPETVERSION to 3.4.1
  (#23343) Use `replace_file` to update a file's contents
Merge branch 'stable'

* stable:
  (packaging) Update PUPPETVERSION to 3.4.1
  (#23343) Use `replace_file` to update a file's contents
(Maint) Remove duplicate test

There are other tests that use the module tool to search for modules.
This kind of check is better done in one of those where the system just
"has to work" as part of some larger narrative arc.
(maint) Fix rdoc generator for Ruby 2.1.0

Ruby 2.1.0 includes RDoc 4.1.0 which added a requirement that
subclasses of ClassModule implement 'add_prefix'. This requirement
was added in this commit:

https://github.com/rdoc/rdoc/commit/1701151b5b14cd20d624c4ce75fd61cc60cd07f3

The rdoc docs for other classes mention that aref_prefix should be
implemented by subclasses, but generally a base class implementation is
provided.  The rdoc doc for ClassModule hasn't been updated to reflect
the new requirement.

This patch simply implements the 'aref_prefix' method.
(maint) Update test to work on non-UTF-8 systems

Not all systems run as UTF-8 (our solaris tests run as US-ASCII). In
those cases \xc2\xa0 (NO-BREAK SPACE) is not a valid character. This
causes the test to fail because of encoding problems. By using \x01 (a
control character) we can check the same scenario, but using a character
sequence that is valid in all of our setups.
Merge branch 'kylog-maint/fix_rdoc_spec_tests_for_mri_2_1_0'

* kylog-maint/fix_rdoc_spec_tests_for_mri_2_1_0:
  (maint) Fix rdoc generator for Ruby 2.1.0
(maint) Drop -v flag when untarring acceptance artifacts
Merge pull request #2188 from hlindberg/pup-546_remove-hiera2-data-in-modules

(PUP-546) remove hiera2 part of data in modules
(PUP-672) Add acceptance test for trusted data

This adds a check that the certificate extensions show up as trusted
data. Does not yet pass as the feature isn't implemented yet.
Merge remote-tracking branch 'hlindberg/pup-798_watch-files-must-be-called' into maint/master/test-future-prs

* hlindberg/pup-798_watch-files-must-be-called:
  (PUP-798) Add call to watch_files to ensure reparsing
(Maint) Remove use of mocking

Using the mocks is not absolutely necessary in this case. It is easy to
construct the certificate and using it makes it a little clearer what
kind of object we are dealing with.
Merge pull request #2189 from kylog/maint/reduce-log-file-verbosity

(maint) Drop -v flag when untarring acceptance artifacts
Merge pull request #2179 from hlindberg/maint_convert-to3x-acceptance-test-fix

(maint) Provide option to 4x->3x convert to handle :undef differently
(maint) Add Optional Type

To be able to more easily deal with undef (not matched by default
except by Data) the convenience type Optional is introduced with
the same semantics as Variant[T, Undef] (i.e. undef/nil) is accepted
instead of real type).
(maint) Add support for Optional in TypeParser and TypeFactory
(maint) Make handling of undef more strict as a type

instace? should not return true for undef for all types. This
means that [undef] =~ Array[Integer] is false. The Data type
was relaxed to still accept undef/nil everywhere except as a key in
a hash.