Merge "Do not use deprecated destroyConfigBean in config tests"