New test for include mechanism in config files #4319
Tweaks after glue refactor #4306
Merge branch 'V8_2-branch'