Adding hiera support. #7713

moving from master branch