pre-labsdb dbs: more node defs

and string quoting fix

Change-Id: Ic688969ba11d8c22537a72d1b10a2223781c4c74
Merge "pre-labsdb dbs: more node defs" into production