bake: move merge logic to an hcl package and add tests

bake: move merge logic to an hcl package and add tests #1820