(maint) Move local egrammar makefile tasks to main Rakefile
(maint) Guard preserve_configuration in acceptance

It is only useful to attempt to generate a local preserved_config.yml if
you are manually testing and may need to re-run.  Automated tools such
as Jenkins have tripped over this step if the logs or layout are
different, and there is no reason to abort a test run for this step.

This commit changes the behavior of the acceptance harness so that it
only preserves the configuration if you are running the manual
'test_and_preserve_hosts' task, or if you have specified you want this
behavior in your local_options.rb.  It is also a little more resilient
for failures when preserving the configuration.
(doc) Remove outdated notice concerning rdoc and ruby > 1.8.7

This note is deprecated by the following pull requests:

https://github.com/puppetlabs/puppet/pull/2009
https://github.com/puppetlabs/puppet/pull/2187

Relevant redmine ticket:

https://projects.puppetlabs.com/issues/22180
Merge pull request #2948 from jpartlow/maint/master/only-preserve-config-for-local-acceptance-runs

(maint) Guard preserve_configuration in acceptance
Merge pull request #2949 from roidelapluie/Remove_Puppet_Doc_Oudated_Documentation

(doc) Remove outdated notice concerning rdoc and ruby > 1.8.7
(PUP-2994) Make validation of storeconfigs a runtime concern.
(maint) Refactor HTTPS verification tests into a shared examples

This commit refactors the spec tests that ensure puppet displays
meaningful error messages when SSL verification fails, e.g. when the
server certificate doesn't match the hostname we connected to.
(PUP-744) Expand scope of OpenSSL rescue block

The persistent http connection work introduced a regression,
preventing the agent from displaying useful error messages when SSL
verification fails, e.g. the server's SSL certificate doesn't match
the hostname the agent tried to connect to. The connection_spec test
didn't catch the issue, because those tests execute with the
non-caching pool, which always uses non-persistent connections.

The root cause is because the Connection class assumed http
connections are started by ruby in the `Net::HTTP#request`
method, so the OpenSSL rescue block wrapped that call.

However, in order to use persistent http connection, the caller needs
to explicitly start the connection prior to calling Net::HTTP#request,
which happens in the outer `Connection#with_connection` method.

This commit expands the scope of the rescue block. This way we receive
meaningful error messages if the connection is started explicitly for
persistent connections, or on-demand for non-persistent connections. It
also executes the ssl verification tests using persistent connections.

Also note that `with_connection` is private, so the fact that
`Pool#with_connection` or `Net::HTTP#request` can start the connection
is not visible to users of the Connection class.
Merge pull request #2954 from joshcooper/ticket/master/PUP-744-rescue-openssl

(PUP-744) Expand scope of OpenSSL rescue block
(PUP-2879) Add cryptdisks-udev to the services blacklist

Also this patch splits out the long line in upstart_spec.rb to be
one line per service, so more diff-friendly.
Merge pull request #2956 from kylog/issue/pup-2879/exclude-cryptdisks-udev

(PUP-2879) Add cryptdisks-udev to the services blacklist
Merge pull request #2953 from hlindberg/PUP-2994_validation-of-exported

(PUP-2994) Make validation of storeconfigs a runtime concern.
(PUP-3001) Revert future parser change removing dynamic scoped defaults

This reverts the change in PUP-867 by (again) calling the same 3x logic
for looking up defaults. The implementation of PUP-867 also added tests,
and one of those are now changed to reflect the changed behavior.
Merge pull request #2957 from hlindberg/PUP-3001_revert-867-dynamic-scoped-defaults-removal

(PUP-3001) Revert future parser change removing dynamic scoped defaults
Merge pull request #2943 from jpartlow/maint/master/move-egrammar-make-to-rake

(maint) Move local egrammar makefile tasks to main Rakefile
(PUP-2879) Add two nfsd-related upstart services to the blacklist