Fix metadata access in prep for instance objects

Related to blueprint unified-object-model
Fixes: bug #1192012

Change-Id: I8b708dc3d89fedfcb4bbf5d26b959da1298b0525
Merge "Fix metadata access in prep for instance objects"