[BUG #8417] reverted Accordion deprecation; merged styles for Accordion and Tabs