[chetemi-10] Same disk model for chetemi-10 and chetemi-cluster.

Related to bug 14169.

added 3 commits

• df66cb54...0a28499a - 2 commits from branch master
• ddde3b31 - [chetemi-10] Same disk model for chetemi-10 and chetemi-cluster.

Compare with previous version

enabled an automatic merge when the pipeline for ddde3b31 succeeds

merged

mentioned in commit 27d0b6e9