That expains one mystery but raises another – when I added my comments in the wee hours, this JIRA was still marked as unresolved and yet my download of the Hive site included your changes. So apparently I can't rely on the JIRA status being current, but at least the system isn't committing patches automatically. Hm, it wasn't just a display buffer problem because I hadn't received email about it either. Most peculiar.
Have you patched
HIVE-6158 yet? I can't trust what I'm seeing on the JIRA. If you prefer, I can revise my patch on HIVE-6155 to include the HIVE-6158 changes. Or (here's a cooperative thought) you could revise my patch.