Merge branch 'master' into 'master'

[cdist]Update os_version for alpine

See merge request !849
3 jobs for master in 58 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Test
passed #2673
pycodestyle

00:00:16

passed #2674
shellcheck

00:00:21

passed #2672
unit_tests

00:00:21