User the non-bridge object mapper
User the non-bridge object mapper
User the non-bridge object mapper
Merge pull request #391 from eric-wu/develop

Wire in distributed lock dao
Fixing the Bridge type name property
Merge pull request #392 from alxdarksage/develop

Fixing the Bridge type name property
Merge remote-tracking branch 'base/develop' into develop