Merge branch 'master' into RM-15016

diff --cc ceph_deploy/hosts/suse/__init__.py
Simple merge

diff --cc ceph_deploy/osd.py
Simple merge

diff --cc ceph_deploy/tests/parser/test_disk.py
Simple merge

diff --cc ceph_deploy/tests/parser/test_osd.py
Simple merge