Merge "Fix up logging grouping in ApiStashEdit"