Merge pull request #14528 from planas/patch-1

Require yaml explicitly on #database_configuration