Issue #3232667 by pyrello, bircher: Change keys of config patch to make reviewing config diffs easier
Closes #3232667