fix(model): adaptations to allow new configuration containers

Change-Id: Ic32b12e69e0872ca281e22f1395ae17199eefcce
Signed-off-by: bravof <fbravo@whitestack.com>
6 files changed