Merge "[EDGEPOD-202] Apply OMEC change to add users to HSSDB as a group"