XD-1949 - Ensure DSM Matrix is diagonal

* Move ContainerAttributes from xd.dirt.container to xd.dirt.cluster