cube container filter
Merge branch 'develop' of https://github.com/LabKey/cds into develop
Merge branch 'develop' of https://github.com/LabKey/cds into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' of https://github.com/LabKey/cds into develop
Merge branch 'develop' of https://github.com/LabKey/cds into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
not using <AllowMDX>
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	resources/olap/CDS.xml
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	resources/olap/CDS.xml
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' of https://github.com/LabKey/cds into develop
Merge branch 'develop' of https://github.com/LabKey/cds into develop
IFDEFINED