Merge deep
Use Utils.deep_merge_hashes
Add a test
Merge pull request #2490 from penibelst/deep-defaults