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

Merge commit 'b81c3989cbb7c94e28d05434c434a62fbf029cb8'

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