Merge remote-tracking branch 'upstream/master' into puppet-4
- upstream/master: (40 commits) (PUP-3186) Only execute symlink code on systems that support it PUP-1244 fix yum handling where version only is specified (PUP-3119) Add yaml output to puppet resource (PUP-3190) Correct acceptance test to ensure output (PUP-3186) Skip creation of symlinked default directory env (PUP-3162) Expand expected config_version (PUP-3190) Change acceptance test to use directory environment (PUP-3190) Improve readability of function creation logic. (PUP-3191) Use FileSystem.readlink in unpacker (maint) Clarify the error message when a relationship can't be established (PUP-3228) Remove "{}" from PUPPETMASTER_EXTRA_OPTS and PUPPET_EXTRA_OPTS in systemd files (PUP-3136) Add detailed exit codes to tests (PUP-3136) Fix Intermittent Acceptance Test Failures (maint) Disable activerecord testcase against puppet-server (PUP-3175) Isolate yamldir for node/check_woy_cache_works.rb (PUP-3173) Fix old references to jvm-puppet in tests. (maint) Fix typos in comments in acceptance test (maint) Generate unique account names (PUP-3222) Rescue StandardError instead of SystemCallError (PUP-3222) Rescue StandardError instead of non-existent exception ...