Collapse data-parent should not depend on accordion class structure.

This is a resubmit of Issue #7152 with the correct branch.