Added hiera merge support