Redmine/6568: Fix ordering of variables and classes in common bundles