am 78a59022: (-s ours) a few more grandfathered user tags - DO NOT MERGE

Merge commit '78a59022f89a65f5e7107d57f4995c1eb70e1fb2'

* commit '78a59022f89a65f5e7107d57f4995c1eb70e1fb2':
  a few more grandfathered user tags - DO NOT MERGE