Support for join_to_timespine metrics with custom grain in the group by

Support for join_to_timespine metrics with custom grain in the group by #4251