am 130b539b: (-s ours) am 890ef4b0: a few more existing user modules to be grandfathered in - DO NOT MERGE

Merge commit '130b539bfdda612dd3858b407c503c3e80d9aa72'

* commit '130b539bfdda612dd3858b407c503c3e80d9aa72':
  a few more existing user modules to be grandfathered in - DO NOT MERGE