get master dictionaries in master core

and a janitorial drive-by in framework

Change-Id: I3106925423cb53f58b59714da49b7928c533e613