Fix #16688 and #16730, calling_module and calling_class lookup in hiera-puppet