
This reverts commit 4728730510409fc15d2b3a55fa6e00008651794d. The clustrix -> xpand name change causes too much trouble when merging to 2.5.
This reverts commit 4728730510409fc15d2b3a55fa6e00008651794d. The clustrix -> xpand name change causes too much trouble when merging to 2.5.