CIMI - minor tidy up/nits in parsing of database models

(related to DTACLOUD-448)