am 0dda5a19: (-s ours) a few more existing user modules to be grandfathered in - DO NOT MERGE

Merge commit '0dda5a191df021a13c91d42109d55f4434b2c5da'

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