WP-3862 Adding code to support hierarchies of option groups