Support shared DB version of Commons definition

Supporting production is Hard Work (tm)

Change-Id: I57b1ea945711f6fe76697927641bf4e805be15cf