UPD: fix a problem with overlapping "db" component settings
UPD: append fix to changelog
Merge pull request #1211 from angel-kulikov/master

UPD: fix a problem with overlapping "db" component settings
UPD: fix previous commit