merge existing config when committing

Fixes #1141

Docker-DCO-1.1-Signed-off-by: Wes Morgan <cap10morgan@gmail.com> (github: cap10morgan)
Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit

merge existing config when committing