Comment 2 for bug 1840946

Generally I'd say this is more of a feature than a bug-fix, so a bit tricky from an SRU POV. But on the other hand, this does seem like something we'd like to have in-sync for all stable series. The test case is sufficiently well formed and regression potential thoroughly laid out - this feels solid enough as far as acceptance criteria go.