Merge branch 'master' into 'development'

# Conflicts:
#   manifests/environments.pp
Status Job ID Name Coverage
  Syntax
failed #461
syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.5.3-Puppet ~> 6

 
  Unit
skipped #463
parallel_spec-Ruby 2.4.5-Puppet ~> 5
skipped #462
parallel_spec-Ruby 2.5.3-Puppet ~> 6
 
Name Stage Failure
failed
syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.5.3-Puppet ~> 6 Syntax There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log