ISPN-2775 Wrap cachestore "complexTypes" in "elements"

https://issues.jboss.org/browse/ISPN-2775

The commit looks huge, but it's just because of indentation