Make the repository product service independent from ODM/ORM
Merge branch 'master' into midway_odm
Merge branch 'midway_odm'