Merge "added level of indirection causes incorrect hiera config" into stable/pike